ITS#6824

diff --git a/CHANGES b/CHANGES
index ddea9c573085f6cc5c26fa4c5192d60a5502f1e0..ab1b9ebf2eef69db0fbddcd1b90602984a6148ea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -59,6 +59,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed slapd when first acl is value dependent (ITS#6693)
        Fixed slapd modify to return actual error (ITS#6581)
        Fixed slapd modrdn with empty DN (ITS#6768)
+       Fixed slapd c_authz_backend setting (ITS#6824)
        Fixed slapd sortvals of attributes with 1 value (ITS#6715)
        Fixed slapd syncrepl reuse of presence list (ITS#6707)
        Fixed slapd syncrepl uninitialized return code (ITS#6719)

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 847904ee9b1b9e48224f318ffa75d2bcfbdbbac7..353660e0af0fcb6a67cd798da279a1914a735c68 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -2005,7 +2005,7 @@ slap_sasl2dn(
        op.o_bd->be_search( &op, &rs );
        
 FINISHED:
-       if( !BER_BVISEMPTY( sasldn ) ) {
+       if( opx == opx->o_conn->c_sasl_bindop && !BER_BVISEMPTY( sasldn ) ) {
                opx->o_conn->c_authz_backend = op.o_bd;
        }
        if( !BER_BVISNULL( &op.o_req_dn ) ) {