From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 6 Mar 2006 21:46:31 +0000 (+0000)
Subject: Need to clear controls before ldap_txn_end_s call.
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~144
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d15ce4d96723152b97c73ec6a3ccba613a3c7411;p=openldap

Need to clear controls before ldap_txn_end_s call.
Provide proxy control in bind calls instead of via ldap_set_option()
---

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 8540507bf6..15f0b55b5d 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -997,15 +997,15 @@ void
 tool_bind( LDAP *ld )
 {
 #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
+	LDAPControl *sctrls[2];
 	if ( ppolicy ) {
-		LDAPControl *ctrls[2], c;
+		LDAPControl c;
 		c.ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST;
 		c.ldctl_value.bv_val = NULL;
 		c.ldctl_value.bv_len = 0;
 		c.ldctl_iscritical = 0;
-		ctrls[0] = &c;
-		ctrls[1] = NULL;
-		ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
+		sctrls[0] = &c;
+		sctrls[1] = NULL;
 	}
 #endif
 
@@ -1033,9 +1033,13 @@ tool_bind( LDAP *ld )
 			passwd.bv_val,
 			sasl_authz_id );
 
-		rc = ldap_sasl_interactive_bind_s( ld, binddn,
-			sasl_mech, NULL, NULL,
-			sasl_flags, lutil_sasl_interact, defaults );
+		rc = ldap_sasl_interactive_bind_s( ld, binddn, sasl_mech,
+#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
+			sctrls,
+#else
+			NULL,
+#endif
+			NULL, sasl_flags, lutil_sasl_interact, defaults );
 
 		lutil_sasl_freedefs( defaults );
 		if( rc != LDAP_SUCCESS ) {
@@ -1069,8 +1073,13 @@ tool_bind( LDAP *ld )
 #endif
 		{
 			/* simple bind */
-			rc = ldap_sasl_bind( ld, binddn, LDAP_SASL_SIMPLE,
-				&passwd, NULL, NULL, &msgid );
+			rc = ldap_sasl_bind( ld, binddn, LDAP_SASL_SIMPLE, &passwd,
+#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
+				sctrls,
+#else
+				NULL,
+#endif
+				NULL, &msgid );
 			if ( msgid == -1 ) {
 				tool_perror( "ldap_sasl_bind(SIMPLE)", rc,
 					NULL, NULL, NULL, NULL );
diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 17589fe0bd..ad789e4552 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -377,6 +377,11 @@ main( int argc, char **argv )
 
 #ifdef LDAP_X_TXN
 	if( txn ) {
+		rc = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, NULL );
+		if ( rc != LDAP_OPT_SUCCESS ) {
+			fprintf( stderr, "Could not unset controls for ldap_txn_end\n");
+		}
+
 		/* create transaction */
 		rc = ldap_txn_end_s( ld, !txnabort, txn_id, NULL, NULL, NULL );
 		if( rc != LDAP_SUCCESS ) {