ITS#8140 - Update bind operations to note bind_ssf vs overall connection ssf

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 997c91c32973e91b56c3f4583997fdaa81c16d02..026ff85d793633e06756f56b177e1ee5387844e4 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -60,8 +60,8 @@ do_bind(
        if ( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
                /* log authorization identity demotion */
                Debug( LDAP_DEBUG_STATS,
-                       "%s BIND anonymous mech=implicit ssf=0\n",
-                       op->o_log_prefix );
+                       "%s BIND anonymous mech=implicit bind_ssf=0 ssf=%d\n",
+                       op->o_log_prefix, op->o_conn->c_ssf );
        }
        connection2anonymous( op->o_conn );
        if ( op->o_conn->c_sasl_bind_in_progress ) {
@@ -534,9 +534,9 @@ fe_op_bind_success( Operation *op, SlapReply *rs )
 
        /* log authorization identity */
        Debug( LDAP_DEBUG_STATS,
-               "%s BIND dn=\"%s\" mech=%s ssf=0\n",
+               "%s BIND dn=\"%s\" mech=%s bind_ssf=0 ssf=%d\n",
                op->o_log_prefix,
-               op->o_conn->c_dn.bv_val, op->orb_mech.bv_val );
+               op->o_conn->c_dn.bv_val, op->orb_mech.bv_val, op->o_conn->c_ssf );
 
        Debug( LDAP_DEBUG_TRACE,
                "do_bind: v%d bind: \"%s\" to \"%s\"\n",

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 8d62d28fd95cf32b0f3ee17f43bbb1cc02eeb689..6bb48b87b9a2f43c82d1e900ff090b07a1e4cdce 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1872,14 +1872,14 @@ static int connection_bind_cb( Operation *op, SlapReply *rs )
 
                        /* log authorization identity */
                        Debug( LDAP_DEBUG_STATS,
-                               "%s BIND dn=\"%s\" mech=%s sasl_ssf=%d ssf=%d\n",
+                               "%s BIND dn=\"%s\" mech=%s bind_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, op->o_conn->c_ssf );
 
                        Debug( LDAP_DEBUG_TRACE,
-                               "do_bind: SASL/%s bind: dn=\"%s\" sasl_ssf=%d\n",
+                               "do_bind: SASL/%s bind: dn=\"%s\" bind_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 );