From: Howard Chu <hyc@openldap.org>
Date: Wed, 3 Dec 2003 03:08:49 +0000 (+0000)
Subject: ITS#2570 TLS retry
X-Git-Tag: OPENLDAP_REL_ENG_2_1_24~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b62c78ddfc66a20c7bbf3d8068f2cafe565dff0;p=thirdparty%2Fopenldap.git

ITS#2570 TLS retry
---

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 6ea78368f3..f56a6acd15 100644
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -750,6 +750,7 @@ do_bind(
 )
 {
     int		ldrc;
+    int		do_tls = ri->ri_tls;
 
     *lderr = 0;
 
@@ -872,7 +873,7 @@ retry:
 	}
 	ldap_set_option(ri->ri_ldp, LDAP_OPT_RESTART, LDAP_OPT_ON);
 
-	if( ri->ri_tls ) {
+	if( do_tls ) {
 		int err;
 		err = ldap_start_tls_s(ri->ri_ldp, NULL, NULL);
 
@@ -894,7 +895,7 @@ retry:
 				ri->ri_ldp = NULL;
 				return BIND_ERR_TLS_FAILED;
 			}
-			ri->ri_tls = TLS_OFF;
+			do_tls = TLS_OFF;
 			goto retry;
 		}
 	}