From: Luke Howard <lukeh@openldap.org>
Date: Thu, 21 Jul 2005 08:39:37 +0000 (+0000)
Subject: SLAPI cleanups
X-Git-Tag: OPENLDAP_AC_BP~302
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0bf8a366a54fb61b355b3f1f903583a66f0a07f1;p=openldap

SLAPI cleanups
---

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 8734fed4ce..92792314f5 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -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,
diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 7207c33c5e..2bd7b6bff0 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -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 );
diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index a162b20068..d8819bd725 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -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 */