upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 08:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

A pre-operation plugin is not required to set SLAPI_RESULT_CODE in

Browse source 
order to prevent the operation from being passed to the backend. It
need only return a non-zero error code.
This commit is contained in:
Luke Howard 2003-04-30 13:37:14 +00:00
parent 20c8128d27
commit e4779aefc1
7 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/add.c
View file

@ -556,8 +556,10 @@ static int doPreAddPluginFNs( Operation *op )
#else #else
Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n", Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
0, 0, 0); 0, 0, 0);
if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 ) if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 ) ||
rc == LDAP_SUCCESS ) {
rc = LDAP_OTHER; rc = LDAP_OTHER;
}
#endif #endif
} else { } else {
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;

5
servers/slapd/bind.c
View file

@ -540,9 +540,10 @@ do_bind(
*/ */
int ldapRc; int ldapRc;
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&ldapRc ) != 0 ) if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&ldapRc ) != 0 ) ||
ldapRc == LDAP_SUCCESS ) {
ldapRc = LDAP_OTHER; ldapRc = LDAP_OTHER;
}
op->orb_edn.bv_val = NULL; op->orb_edn.bv_val = NULL;
op->orb_edn.bv_len = 0; op->orb_edn.bv_len = 0;
if ( rs->sr_err != SLAPI_BIND_FAIL && ldapRc == LDAP_SUCCESS ) { if ( rs->sr_err != SLAPI_BIND_FAIL && ldapRc == LDAP_SUCCESS ) {

4
servers/slapd/compare.c
View file

@ -272,8 +272,10 @@ do_compare(
Debug(LDAP_DEBUG_TRACE, "do_compare: compare preoperation plugin " Debug(LDAP_DEBUG_TRACE, "do_compare: compare preoperation plugin "
"failed.\n", 0, 0, 0); "failed.\n", 0, 0, 0);
#endif #endif
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0) if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0 ) ||
rs->sr_err == LDAP_SUCCESS ) {
rs->sr_err = LDAP_OTHER; rs->sr_err = LDAP_OTHER;
}
goto cleanup; goto cleanup;
} }
#endif /* defined( LDAP_SLAPI ) */ #endif /* defined( LDAP_SLAPI ) */

4
servers/slapd/delete.c
View file

@ -173,8 +173,10 @@ do_delete(
Debug (LDAP_DEBUG_TRACE, "do_delete: delete preoperation plugin failed.\n", Debug (LDAP_DEBUG_TRACE, "do_delete: delete preoperation plugin failed.\n",
0, 0, 0); 0, 0, 0);
#endif #endif
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0 ) if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0 ) ||
rs->sr_err == LDAP_SUCCESS ) {
rs->sr_err = LDAP_OTHER; rs->sr_err = LDAP_OTHER;
}
goto cleanup; goto cleanup;
} }
#endif /* defined( LDAP_SLAPI ) */ #endif /* defined( LDAP_SLAPI ) */

3
servers/slapd/modify.c
View file

@ -347,7 +347,8 @@ do_modify(
Debug(LDAP_DEBUG_TRACE, "do_modify: modify preoperation plugin failed.\n", Debug(LDAP_DEBUG_TRACE, "do_modify: modify preoperation plugin failed.\n",
0, 0, 0); 0, 0, 0);
#endif #endif
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0) { if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0 ) ||
rs->sr_err == LDAP_SUCCESS ) {
rs->sr_err = LDAP_OTHER; rs->sr_err = LDAP_OTHER;
} }
slapi_x_free_ldapmods( modv ); slapi_x_free_ldapmods( modv );

4
servers/slapd/modrdn.c
View file

@ -336,8 +336,10 @@ do_modrdn(
Debug(LDAP_DEBUG_TRACE, "do_modrdn: modrdn preoperation plugin " Debug(LDAP_DEBUG_TRACE, "do_modrdn: modrdn preoperation plugin "
"failed.\n", 0, 0, 0); "failed.\n", 0, 0, 0);
#endif #endif
if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0) if ( ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0 ) ||
rs->sr_err == LDAP_SUCCESS ) {
rs->sr_err = LDAP_OTHER; rs->sr_err = LDAP_OTHER;
}
goto cleanup; goto cleanup;
} }
#endif /* defined( LDAP_SLAPI ) */ #endif /* defined( LDAP_SLAPI ) */

4
servers/slapd/search.c
View file

@ -482,8 +482,10 @@ static int doPreSearchPluginFNs( Operation *op )
Debug(LDAP_DEBUG_TRACE, "doPreSearchPluginFNs: search preoperation plugin " Debug(LDAP_DEBUG_TRACE, "doPreSearchPluginFNs: search preoperation plugin "
"returned %d.\n", rc, 0, 0); "returned %d.\n", rc, 0, 0);
#endif #endif
if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0) if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 ) ||
rc == LDAP_SUCCESS ) {
rc = LDAP_OTHER; rc = LDAP_OTHER;
}
} else { } else {
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;
} }