cleanup bind

[openldap] / servers / slapd / sasl.c

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 355a5c3c0bd8cf4b5c6798f00e9b3088ec2fd840..518db4ec92b08b6362daedab1ade8d101d323956 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -438,6 +438,7 @@ slap_auxprop_lookup(
                        op.o_callback = &cb;
                        op.o_time = slap_get_time();
                        op.o_do_not_cache = 1;
+                       op.o_is_auth_check = 1;
                        op.o_threadctx = conn->c_sasl_bindop->o_threadctx;
 
                        (*be->be_search)( be, conn, &op, NULL, &dn,
@@ -563,6 +564,7 @@ slap_sasl_checkpass(
                op.o_callback = &cb;
                op.o_time = slap_get_time();
                op.o_do_not_cache = 1;
+               op.o_is_auth_check = 1;
                op.o_threadctx = conn->c_sasl_bindop->o_threadctx;
 
                (*be->be_search)( be, conn, &op, NULL, &dn,
@@ -1436,7 +1438,7 @@ int
 slap_sasl_setpass(
        Connection      *conn,
        Operation       *op,
-       const char      *reqoid,
+       struct berval   *reqoid,
        struct berval   *reqdata,
        char            **rspoid,
        struct berval   **rspdata,
@@ -1449,7 +1451,7 @@ slap_sasl_setpass(
        struct berval old = { 0, NULL };
 
        assert( reqoid != NULL );
-       assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
+       assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
 
        rc = sasl_getprop( conn->c_sasl_context, SASL_USERNAME,
                (SASL_CONST void **)&id.bv_val );