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

SLAPI cleanups

Browse source
This commit is contained in:
Luke Howard 2005-07-21 08:39:37 +00:00
parent 7129f9ef91
commit 0bf8a366a5
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/backend.c
View file

@ -1773,8 +1773,6 @@ int backend_operational(
static void init_group_pblock( Operation *op, Entry *target,
Entry *e, struct berval *op_ndn, AttributeDescription *group_at )
{
slapi_int_pblock_set_operation( op->o_pb, op );
slapi_pblock_set( op->o_pb,
SLAPI_X_GROUP_ENTRY, (void *)e );
slapi_pblock_set( op->o_pb,

11
servers/slapd/result.c
View file

@ -1522,6 +1522,9 @@ int slap_read_controls(
BerElement *ber = (BerElement *) &berbuf;
LDAPControl c;
Operation myop;
#ifdef LDAP_SLAPI
Slapi_PBlock *pb;
#endif
Debug( LDAP_DEBUG_ANY, "slap_read_controls: (%s) %s\n",
oid->bv_val, e->e_dn, 0 );
@ -1540,8 +1543,15 @@ int slap_read_controls(
myop = *op;
myop.o_bd = NULL;
myop.o_res_ber = ber;
#ifdef LDAP_SLAPI
pb = myop.o_pb;
myop.o_pb = NULL;
#endif
rc = slap_send_search_entry( &myop, rs );
#ifdef LDAP_SLAPI
myop.o_pb = pb;
#endif
if( rc ) return rc;
rc = ber_flatten2( ber, &c.ldctl_value, 0 );
@ -1720,7 +1730,6 @@ static int call_pre_result_plugins( Operation *op, SlapReply *rs )
return 0;
}
slapi_int_pblock_set_operation( op->o_pb, op );
slapi_pblock_set( op->o_pb, SLAPI_RESCONTROLS, (void *)rs->sr_ctrls );
slapi_pblock_set( op->o_pb, SLAPI_RESULT_CODE, (void *)rs->sr_err );
slapi_pblock_set( op->o_pb, SLAPI_RESULT_TEXT, (void *)rs->sr_text );

9
servers/slapd/search.c
View file

@ -500,14 +500,5 @@ static void call_search_postop_plugins( Operation *op )
}
}
void slapi_int_dummy(void)
{
/*
* XXX slapi_search_internal() was no getting pulled
* in; all manner of linker flags failed to link it.
* FIXME
*/
slapi_search_internal( NULL, 0, NULL, NULL, NULL, 0 );
}
#endif /* LDAP_SLAPI */