ITS#4088 force cursors to use same locker

[openldap] / servers / slapd / saslauthz.c

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 3e28af1fd6b9bfe390b9b2c573dd8991a2a4feb4..a7ef89783d27b3b3c6503ed3050476fe324e3519 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -452,7 +452,7 @@ is_dn:              bv.bv_len = in->bv_len - ( bv.bv_val - in->bv_val );
        }
 
        /* Grab the searchbase */
-       assert( ludp->lud_dn );
+       assert( ludp->lud_dn != NULL );
        ber_str2bv( ludp->lud_dn, 0, 0, &bv );
        rc = dnValidate( NULL, &bv );
 
@@ -830,7 +830,7 @@ is_dn:              bv.bv_len = val->bv_len - ( bv.bv_val - val->bv_val );
        }
 
        /* Grab the searchbase */
-       assert( ludp->lud_dn );
+       assert( ludp->lud_dn != NULL );
        if ( ludp->lud_dn ) {
                struct berval   out = BER_BVNULL;
 
@@ -1397,6 +1397,12 @@ int slap_sasl_regexp_config( const char *match, const char *replace )
                "SASL match pattern %s could not be compiled by regexp engine\n",
                reg->sr_match, 0, 0 );
 
+#ifdef ENABLE_REWRITE
+       /* Dummy block to force symbol references in librewrite */
+       if ( slapMode == ( SLAP_SERVER_MODE|SLAP_TOOL_MODE )) {
+               rewrite_info_init( 0 );
+       }
+#endif
                return( LDAP_OTHER );
        }
 
@@ -1825,7 +1831,7 @@ exact_match:
        op.o_tag = LDAP_REQ_SEARCH;
        op.o_ndn = *authc;
        op.o_callback = &cb;
-       op.o_time = slap_get_time();
+       slap_op_time( &op.o_time, &op.o_tincr );
        op.o_do_not_cache = 1;
        op.o_is_auth_check = 1;
        /* use req_ndn as req_dn instead of non-pretty base of uri */
@@ -1993,7 +1999,7 @@ slap_sasl2dn(
        op.o_tag = LDAP_REQ_SEARCH;
        op.o_ndn = opx->o_conn->c_ndn;
        op.o_callback = &cb;
-       op.o_time = slap_get_time();
+       slap_op_time( &op.o_time, &op.o_tincr );
        op.o_do_not_cache = 1;
        op.o_is_auth_check = 1;
        op.ors_deref = LDAP_DEREF_NEVER;