From d649ae080890aad437be4627195f3ee652d1cdc9 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Sun, 31 Aug 2003 08:14:54 +0000 Subject: [PATCH] Inherit operation pblock for SLAPI --- servers/slapd/sasl.c | 6 ++++++ servers/slapd/saslauthz.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index a8f3eca30f..feb4d5ecb6 100644 --- 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 151da5cdc4..258301e38d 100644 --- 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; -- 2.39.5