remove dbenv->lock_put() call from transaction-protected operations

[openldap] / servers / slapd / sasl.c

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 5f9fa2c6f2cd0844994a0266f84d988a1f2fc2e2..ba1cdb0c2fae812807adca27485fa1e622506513 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -541,7 +541,7 @@ slap_sasl_canonicalize(
                sasl_out_params_t dummy;
                int offset = (void *)&dummy.ulen - (void *)&dummy.authid;
                char **authid = (void *)out_len - offset;
-               if ( !strcmp( in, *authid ) )
+               if ( *authid && !strcmp( in, *authid ) )
                        goto done;
        }
 
@@ -561,14 +561,12 @@ slap_sasl_canonicalize(
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
                "slap_sasl_canonicalize: conn %d %s=\"%s\"\n",
                        conn ? conn->c_connid : -1,
-                       (flags & SASL_CU_AUTHID) ? "authcDN" : "authzDN",
-                       dn.bv_val ));
+                       names[0]+1, dn.bv_val ));
 #else
        Debug( LDAP_DEBUG_ARGS, "SASL Canonicalize [conn=%ld]: "
                "%s=\"%s\"\n",
                        conn ? conn->c_connid : -1,
-                       (flags & SASL_CU_AUTHID) ? "authcDN" : "authzDN",
-                       dn.bv_val );
+                       names[0]+1, dn.bv_val );
 #endif
 done:  AC_MEMCPY( out, in, inlen );
        out[inlen] = '\0';