From e86e4f98af1fb68c2030e6404a32c3eaac55bb6d Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 10 May 2007 19:34:27 +0000 Subject: [PATCH] ITS#4954 clear c_sasl_dn after error --- servers/slapd/sasl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index 9018185dcf..cf952291bf 100644 --- a/servers/slapd/sasl.c +++ b/servers/slapd/sasl.c @@ -610,6 +610,7 @@ slap_sasl_canonicalize( */ if ( flags == SASL_CU_AUTHID && !auxvals[SLAP_SASL_PROP_AUTHZ].values ) { conn->c_sasl_dn.bv_val = (char *) in; + conn->c_sasl_dn.bv_len = 0; } else if ( flags == SASL_CU_AUTHZID && conn->c_sasl_dn.bv_val ) { rc = strcmp( in, conn->c_sasl_dn.bv_val ); conn->c_sasl_dn.bv_val = NULL; @@ -624,13 +625,13 @@ slap_sasl_canonicalize( if ( rc != LDAP_SUCCESS ) { sasl_seterror( sconn, 0, ldap_err2string( rc ) ); return SASL_NOAUTHZ; - } + } names[0] = slap_propnames[which]; names[1] = NULL; prop_set( props, names[0], (char *)&dn, sizeof( dn ) ); - + Debug( LDAP_DEBUG_ARGS, "SASL Canonicalize [conn=%ld]: %s=\"%s\"\n", conn ? conn->c_connid : -1, names[0]+1, dn.bv_val ? dn.bv_val : "" ); @@ -1710,6 +1711,9 @@ int slap_sasl_bind( Operation *op, SlapReply *rs ) send_ldap_sasl( op, rs ); } else { + if ( op->o_conn->c_sasl_dn.bv_len ) + ch_free( op->o_conn->c_sasl_dn.bv_val ); + BER_BVZERO( &op->o_conn->c_sasl_dn ); #if SASL_VERSION_MAJOR >= 2 rs->sr_text = sasl_errdetail( ctx ); #endif -- 2.39.5