ITS#2253 - when StartTLS fails, slapd closes the connection so slurpd

must unbind and re-initialize the LDAP session.

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 7e4d4de498bab95b312dd14508ea8b991752f54a..a39df976f00e346e7646601be36df3bff4fb6196 100644 (file)
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -762,6 +762,7 @@ do_bind(
        return( BIND_ERR_BADRI );
     }
 
+retry:
     if ( ri->ri_ldp != NULL ) {
        ldrc = ldap_unbind( ri->ri_ldp );
        if ( ldrc != LDAP_SUCCESS ) {
@@ -868,6 +869,8 @@ do_bind(
                                ri->ri_ldp = NULL;
                                return BIND_ERR_TLS_FAILED;
                        }
+                       ri->ri_tls = TLS_OFF;
+                       goto retry;
                }
        }