upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 17:49:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't return LDAP_OPERATIONS_ERROR for internal errors

Browse source
This commit is contained in:
Kurt Zeilenga 2003-03-01 20:17:52 +00:00
parent 81d2b2bb65
commit c981ebcb61
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/back-sql/modify.c
View file

@ -701,7 +701,7 @@ backsql_modrdn(
Debug( LDAP_DEBUG_TRACE, "backsql_modrdn(): "
"newSuperior is equal to entry being moved "
"- aborting\n", 0, 0, 0 );
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "newSuperior is equal to old DN",
NULL, NULL );
goto modrdn_return;

10
servers/slapd/slapi/slapi_ops.c
View file

@ -545,7 +545,7 @@ slapi_delete_internal(
}
rc = LDAP_SUCCESS;
} else {
rc = LDAP_OPERATIONS_ERROR;
rc = LDAP_OTHER;
}
} else {
rc = LDAP_REFERRAL;
@ -708,7 +708,6 @@ slapi_add_internal(
* of an entry in the backend directly
* Return values : LDAP_SUCCESS
* LDAP_PARAM_ERROR
* LDAP_OPERATIONS_ERROR
* LDAP_NO_MEMORY
* LDAP_OTHER
* LDAP_UNWILLING_TO_PERFORM
@ -823,7 +822,7 @@ slapi_modrdn_internal(
rc = LDAP_SUCCESS;
} else {
rc = LDAP_OPERATIONS_ERROR;
rc = LDAP_OTHER;
}
} else {
@ -867,7 +866,6 @@ cleanup:
* Return values : LDAP_SUCCESS
* LDAP_PARAM_ERROR
* LDAP_NO_MEMORY
* LDAP_OPERATIONS_ERROR
* LDAP_OTHER
* LDAP_UNWILLING_TO_PERFORM
*/
@ -1039,7 +1037,7 @@ slapi_modify_internal(
}
rc = LDAP_SUCCESS;
} else {
rc = LDAP_OPERATIONS_ERROR;
rc = LDAP_OTHER;
}
} else {
rc = LDAP_REFERRAL;
@ -1213,7 +1211,7 @@ slapi_search_internal_bind(
if ( rc == 0 ) {
rc = LDAP_SUCCESS;
} else {
rc = LDAP_OPERATIONS_ERROR;
rc = LDAP_OTHER;
}
} else {
rc = LDAP_UNWILLING_TO_PERFORM;

4
servers/slapd/slapi/slapi_utils.c
View file

@ -635,8 +635,8 @@ slapi_entry_delete_values( Slapi_Entry *e, const char *type, struct berval **val
}
if ( vals[0] == NULL ) {
/* SLAPI doco says LDAP_OPERATIONS_ERROR */
return attr_delete( &e->e_attrs, mod.sm_desc ) ? LDAP_OPERATIONS_ERROR : LDAP_SUCCESS;
/* SLAPI doco says LDAP_OPERATIONS_ERROR but LDAP_OTHER is better */
return attr_delete( &e->e_attrs, mod.sm_desc ) ? LDAP_OTHER : LDAP_SUCCESS;
}
rc = bvptr2obj( vals, &mod.sm_bvalues );