Fix SASL ssf logging (ITS#5001)

diff --git a/CHANGES b/CHANGES
index 626cfcd0e0236098edd98e038c8b79cac5198e36..d5f7ba99228e4c76dffb49d1420f0181df594ae2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,10 +4,11 @@ OpenLDAP 2.3.36 Engineering
        Fixed slapd error code on Windows (ITS#4945, #4606)
        Fixed slapd mutex bug after failed startup (ITS#4957)
        Fixed slapd sasl failed Bind bug (ITS#4954)
+       Fixed slapd sasl ssf logging (ITS#5001)
        Fixed slapd tool op init (ITS#4911)
        Fixed slapd-bdb no-op crasher (ITS#4925)
-       Fixed slapd-config olcModuleLoad replace (ITS#4921,ITS#4923)
        Fixed slapd-config olcLogLevel (ITS#4949)
+       Fixed slapd-config olcModuleLoad replace (ITS#4921,ITS#4923)
        Fixed slapd-relay crash when no database can be selected (ITS#4958)
        Fixed slapo-chain RFC3062 passwd exop handling (ITS#4964)
        Fixed slapo-dynlist multiple group/url[/member] config (ITS#4989)

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 71333b7ce1bff3a0cffb650164454fa61c6c647c..5c28c6cf069841665edcedddd75689e080854f85 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1805,13 +1805,14 @@ static int connection_bind_cb( Operation *op, SlapReply *rs )
 
                        /* log authorization identity */
                        Statslog( LDAP_DEBUG_STATS,
-                               "%s BIND dn=\"%s\" mech=%s ssf=%d\n",
+                               "%s BIND dn=\"%s\" mech=%s sasl_ssf=%d ssf=%d\n",
                                op->o_log_prefix,
                                BER_BVISNULL( &op->o_conn->c_dn ) ? "<empty>" : op->o_conn->c_dn.bv_val,
-                               op->o_conn->c_authmech.bv_val, op->orb_ssf, 0 );
+                               op->o_conn->c_authmech.bv_val,
+                               op->orb_ssf, op->o_conn->c_ssf );
 
                        Debug( LDAP_DEBUG_TRACE,
-                               "do_bind: SASL/%s bind: dn=\"%s\" ssf=%d\n",
+                               "do_bind: SASL/%s bind: dn=\"%s\" sasl_ssf=%d\n",
                                op->o_conn->c_authmech.bv_val,
                                BER_BVISNULL( &op->o_conn->c_dn ) ? "<empty>" : op->o_conn->c_dn.bv_val,
                                op->orb_ssf );