From: Howard Chu <hyc@openldap.org>
Date: Wed, 12 Mar 2003 04:38:12 +0000 (+0000)
Subject: ITS#2253 - when StartTLS fails, slapd closes the connection so slurpd
X-Git-Tag: NO_SLAP_OP_BLOCKS~140
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6694db8fd4c5fd7221c8b92bcbd484c7842a0072;p=openldap

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 7e4d4de498..a39df976f0 100644
--- 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;
 		}
 	}