Import ITS#2423 fix from HEAD, it seems to have been overlooked before

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 8da54946fe8bfa1d676a0db153d82eeb6d0d4f27..6ea78368f3dec3ff8cfc0827332ca3fca196180b 100644 (file)
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -968,13 +968,14 @@ retry:
        }
 
        {
-               char *passwd = ri->ri_password ? ber_strdup( ri->ri_password ) : NULL;
                void *defaults = lutil_sasl_defaults( ri->ri_ldp, ri->ri_saslmech,
-                   ri->ri_realm, ri->ri_authcId, passwd, ri->ri_authzId );
+                   ri->ri_realm, ri->ri_authcId, ri->ri_password, ri->ri_authzId );
 
                ldrc = ldap_sasl_interactive_bind_s( ri->ri_ldp, ri->ri_bind_dn,
                    ri->ri_saslmech, NULL, NULL,
                    LDAP_SASL_QUIET, lutil_sasl_interact, defaults );
+
+               lutil_sasl_freedefs( defaults );
                if ( ldrc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG ( OPERATION, ERR, "do_bind: "
@@ -989,9 +990,6 @@ retry:
                        ri->ri_ldp = NULL;
                        return( BIND_ERR_SASL_FAILED );
                }
-
-               ber_memfree( passwd );
-               ber_memfree( defaults );
        }
        break;
 #else