From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 15 Jun 2007 01:49:38 +0000 (+0000)
Subject: Fix SASL ssf logging (ITS#5001)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_36~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e13701ad04ec9cfc19589ec381f9aa6f688475a;p=thirdparty%2Fopenldap.git

Fix SASL ssf logging (ITS#5001)
---

diff --git a/CHANGES b/CHANGES
index 626cfcd0e0..d5f7ba9922 100644
--- 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 71333b7ce1..5c28c6cf06 100644
--- 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 );