mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-24 08:39:37 -05:00
Return LDAP_OTHER instead of LDAP_OPERATIONS_ERROR for internal SLAPI
failure
This commit is contained in:
parent
4a9213f752
commit
ff263ec6a7
8 changed files with 11 additions and 11 deletions
|
|
@ -246,7 +246,7 @@ do_add( Connection *conn, Operation *op )
|
|||
Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
|
||||
0, 0, 0);
|
||||
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
goto done;
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -559,7 +559,7 @@ do_bind(
|
|||
int ldapRc;
|
||||
|
||||
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&ldapRc ) != 0 )
|
||||
ldapRc = LDAP_OPERATIONS_ERROR;
|
||||
ldapRc = LDAP_OTHER;
|
||||
|
||||
edn.bv_val = NULL;
|
||||
edn.bv_len = 0;
|
||||
|
|
|
|||
|
|
@ -294,7 +294,7 @@ do_compare(
|
|||
"failed.\n", 0, 0, 0);
|
||||
#endif
|
||||
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0)
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
goto cleanup;
|
||||
}
|
||||
#endif /* defined( LDAP_SLAPI ) */
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ do_delete(
|
|||
0, 0, 0);
|
||||
#endif
|
||||
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
goto cleanup;
|
||||
}
|
||||
#endif /* defined( LDAP_SLAPI ) */
|
||||
|
|
|
|||
|
|
@ -256,26 +256,26 @@ do_extended(
|
|||
rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_OID,
|
||||
(void *)reqoid.bv_val);
|
||||
if ( rc != LDAP_SUCCESS ) {
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
goto done;
|
||||
}
|
||||
|
||||
rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_VALUE,
|
||||
(void *)&reqdata);
|
||||
if ( rc != LDAP_SUCCESS ) {
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
goto done;
|
||||
}
|
||||
|
||||
rc = slapi_x_connection_set_pb( pb, conn );
|
||||
if ( rc != LDAP_SUCCESS ) {
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
goto done;
|
||||
}
|
||||
|
||||
rc = slapi_x_operation_set_pb( pb, op );
|
||||
if ( rc != LDAP_SUCCESS ) {
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -362,7 +362,7 @@ do_modify(
|
|||
0, 0, 0);
|
||||
#endif
|
||||
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0) {
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
}
|
||||
ldap_mods_free( modv, 1 );
|
||||
modv = NULL;
|
||||
|
|
|
|||
|
|
@ -353,7 +353,7 @@ do_modrdn(
|
|||
"failed.\n", 0, 0, 0);
|
||||
#endif
|
||||
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0)
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
goto cleanup;
|
||||
}
|
||||
#endif /* defined( LDAP_SLAPI ) */
|
||||
|
|
|
|||
|
|
@ -367,7 +367,7 @@ do_search(
|
|||
"failed.\n", 0, 0, 0);
|
||||
#endif
|
||||
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0)
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
rc = LDAP_OTHER;
|
||||
return rc;
|
||||
}
|
||||
#endif /* defined( LDAP_SLAPI ) */
|
||||
|
|
|
|||
Loading…
Reference in a new issue