From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 21 Feb 2003 17:11:46 +0000 (+0000)
Subject: Back out interact free() fixes.  Will fix properly in next commit.
X-Git-Tag: NO_SLAP_OP_BLOCKS~330
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2c939f7196e2ad3ec907c277494b9d3e932585c2;p=openldap

Back out interact free() fixes.  Will fix properly in next commit.
---

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 3032f8c8dc..b6aae585c5 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1999-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1999-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -599,22 +599,16 @@ ldap_int_sasl_bind(
 			}
 		}
 
-		if( saslrc == SASL_INTERACT ) {
-			int res;
-
 #if SASL_VERSION_MAJOR >= 2
-			/* XXX the application should free interact results.
-			 * FIXME: this should happen only 
-			 * if saslrc == SASL_INTERACT
-			 *
-			 * I assume that prompts->result is not needed
-			 * by the subsequent call to (interact)() */
-			if ( prompts != NULL && prompts->result != NULL ) {
-				LDAP_FREE( (void *)prompts->result );
-				prompts->result = NULL;
-			}
+		/* XXX the application should free interact results. */
+		if ( prompts != NULL && prompts->result != NULL ) {
+			LDAP_FREE( (void *)prompts->result );
+			prompts->result = NULL;
+		}
 #endif
 
+		if( saslrc == SASL_INTERACT ) {
+			int res;
 			if( !interact ) break;
 			res = (interact)( ld, flags, defaults, prompts );
 			if( res != LDAP_SUCCESS ) {