Inherit operation pblock for SLAPI

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index a8f3eca30ff548d4bc4300941ebc93a9bd18a2c3..feb4d5ecb6385d94562446b43d7763095d7221e8 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -440,6 +440,9 @@ slap_auxprop_lookup(
                        op.o_threadctx = conn->c_sasl_bindop->o_threadctx;
                        op.o_tmpmemctx = conn->c_sasl_bindop->o_tmpmemctx;
                        op.o_tmpmfuncs = conn->c_sasl_bindop->o_tmpmfuncs;
+#ifdef LDAP_SLAPI
+                       op.o_pb = conn->c_sasl_bindop->o_pb;
+#endif
                        op.o_conn = conn;
                        op.o_connid = conn->c_connid;
                        op.ors_scope = LDAP_SCOPE_BASE;
@@ -565,6 +568,9 @@ slap_sasl_checkpass(
                op.o_threadctx = conn->c_sasl_bindop->o_threadctx;
                op.o_tmpmemctx = conn->c_sasl_bindop->o_tmpmemctx;
                op.o_tmpmfuncs = conn->c_sasl_bindop->o_tmpmfuncs;
+#ifdef LDAP_SLAPI
+               op.o_pb = conn->c_sasl_bindop->o_pb;
+#endif
                op.o_conn = conn;
                op.o_connid = conn->c_connid;
                op.ors_scope = LDAP_SCOPE_BASE;

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 151da5cdc4207f033593494381c317f67b599579..258301e38d39b8caf3555e18d22f3a0e129b5e0f 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -456,6 +456,9 @@ int slap_sasl_match( Operation *opx, struct berval *rule,
        op.o_threadctx = opx->o_threadctx;
        op.o_tmpmemctx = opx->o_tmpmemctx;
        op.o_tmpmfuncs = opx->o_tmpmfuncs;
+#ifdef LDAP_SLAPI
+       op.o_pb = opx->o_pb;
+#endif
        op.o_conn = opx->o_conn;
        op.o_connid = opx->o_connid;
 
@@ -620,6 +623,9 @@ void slap_sasl2dn( Operation *opx,
        op.o_threadctx = opx->o_threadctx;
        op.o_tmpmemctx = opx->o_tmpmemctx;
        op.o_tmpmfuncs = opx->o_tmpmfuncs;
+#ifdef LDAP_SLAPI
+       op.o_pb = opx->o_pb;
+#endif
        op.oq_search.rs_deref = LDAP_DEREF_NEVER;
        op.oq_search.rs_slimit = 1;
        op.oq_search.rs_attrsonly = 1;