From: Howard Chu <hyc@openldap.org>
Date: Sat, 13 Dec 2003 21:39:51 +0000 (+0000)
Subject: Always set c_authmech
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~200
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d9aec4ef28eda1bf9ec6f3e44be57f3ed4c450e2;p=openldap

Always set c_authmech
---

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 4e56336924..15eae9758d 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -397,6 +397,7 @@ do_bind(
 	}
 
 	if ( method == LDAP_AUTH_SIMPLE ) {
+		ber_str2bv( "SIMPLE", sizeof("SIMPLE")-1, 0, &mech );
 		/* accept "anonymous" binds */
 		if ( op->orb_cred.bv_len == 0 || op->o_req_ndn.bv_len == 0 ) {
 			rs->sr_err = LDAP_SUCCESS;
@@ -475,6 +476,7 @@ do_bind(
 #endif
 			goto cleanup;
 		}
+		ber_str2bv( "KRBV4", sizeof("KRBV4")-1, 0, &mech );
 #endif
 
 	} else {
@@ -599,10 +601,10 @@ do_bind(
 				}
 				/* log authorization identity */
 				Statslog( LDAP_DEBUG_STATS,
-					"conn=%lu op=%lu BIND dn=\"%s\" mech=simple (SLAPI) ssf=0\n",
+					"conn=%lu op=%lu BIND dn=\"%s\" mech=%s (SLAPI) ssf=0\n",
 					op->o_connid, op->o_opid,
 					op->o_conn->c_dn.bv_val ? op->o_conn->c_dn.bv_val : "<empty>",
-					0, 0 );
+					mech.bv_val, 0 );
 				ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 			}
 			goto cleanup;
@@ -639,9 +641,9 @@ do_bind(
 
 			/* log authorization identity */
 			Statslog( LDAP_DEBUG_STATS,
-				"conn=%lu op=%lu BIND dn=\"%s\" mech=simple ssf=0\n",
+				"conn=%lu op=%lu BIND dn=\"%s\" mech=%s ssf=0\n",
 				op->o_connid, op->o_opid,
-				op->o_conn->c_dn.bv_val, 0, 0 );
+				op->o_conn->c_dn.bv_val, mech.bv_val, 0 );
 
 #ifdef NEW_LOGGING
 			LDAP_LOG( OPERATION, DETAIL1, 
@@ -682,6 +684,9 @@ do_bind(
 #endif /* defined( LDAP_SLAPI ) */
 
 cleanup:
+	if ( rs->sr_err == LDAP_SUCCESS && method != LDAP_AUTH_SASL ) {
+		ber_dupbv( &op->o_conn->c_authmech, &mech );
+	}
 
 	op->o_conn->c_sasl_bindop = NULL;