mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-24 08:39:37 -05:00
more SLAPI cleanups
This commit is contained in:
parent
1254419f16
commit
ddbbbe2348
3 changed files with 7 additions and 13 deletions
|
|
@ -131,7 +131,6 @@ static void free_extension(struct slapi_extension_block *eblock, int objecttype,
|
|||
eblock->extensions[extensionhandle] = NULL;
|
||||
}
|
||||
}
|
||||
#endif /* LDAP_SLAPI */
|
||||
|
||||
void *slapi_get_object_extension(int objecttype, void *object, int extensionhandle)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -293,9 +293,10 @@ slapi_int_set_operation_dn( Slapi_PBlock *pb )
|
|||
if ( BER_BVISNULL( &op->o_ndn ) ) {
|
||||
/* set to root DN */
|
||||
be = select_backend( &op->o_req_ndn, 0, 0 );
|
||||
assert( be != NULL );
|
||||
ber_dupbv( &op->o_dn, &be->be_rootdn );
|
||||
ber_dupbv( &op->o_ndn, &be->be_rootndn );
|
||||
if ( be != NULL ) {
|
||||
ber_dupbv( &op->o_dn, &be->be_rootdn );
|
||||
ber_dupbv( &op->o_ndn, &be->be_rootndn );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -384,9 +385,7 @@ slapi_int_func_internal_pb( Slapi_PBlock *pb, slap_operation_t which )
|
|||
|
||||
func = &pb->pop->o_bd->be_bind;
|
||||
|
||||
rc = func[which]( pb->pop, &pb->rs );
|
||||
|
||||
return rc;
|
||||
return func[which]( pb->pop, &pb->rs );
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -36,20 +36,16 @@ static int slapi_over_response( Operation *op, SlapReply *rs );
|
|||
static int slapi_over_cleanup( Operation *op, SlapReply *rs );
|
||||
|
||||
static Slapi_PBlock *
|
||||
slapi_over_pblock_new ( Operation *op )
|
||||
slapi_over_pblock_new( Operation *op )
|
||||
{
|
||||
Slapi_PBlock *pb;
|
||||
|
||||
pb = slapi_pblock_new();
|
||||
if ( pb == NULL ) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pb->pop = op;
|
||||
pb->pconn = op->o_conn;
|
||||
pb->internal_op = 0;
|
||||
|
||||
PBLOCK_ASSERT_OP( pb, 0 );
|
||||
PBLOCK_ASSERT_OP( pb, op->o_tag );
|
||||
|
||||
return pb;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue