From: Ryan Tandy <ryan@nardis.ca>
Date: Sat, 4 Aug 2018 22:14:11 +0000 (-0700)
Subject: Revert "ITS#8650 retry gnutls_handshake after GNUTLS_E_AGAIN"
X-Git-Tag: OPENLDAP_REL_ENG_2_4_47~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fab6492f7ce054fc72a9618f668f8550b535590;p=thirdparty%2Fopenldap.git

Revert "ITS#8650 retry gnutls_handshake after GNUTLS_E_AGAIN"

This reverts commit 7b5181da8cdd47a13041f9ee36fa9590a0fa6e48.
---

diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
index da40eb005f..0266ff19ca 100644
--- a/libraries/libldap/tls_g.c
+++ b/libraries/libldap/tls_g.c
@@ -358,9 +358,7 @@ tlsg_session_accept( tls_session *session )
 	tlsg_session *s = (tlsg_session *)session;
 	int rc;
 
-	for ( rc = gnutls_handshake ( s->session );
-	      rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN;
-	      rc = gnutls_handshake ( s->session ) );
+	rc = gnutls_handshake( s->session );
 	if ( rc == 0 && s->ctx->reqcert != LDAP_OPT_X_TLS_NEVER ) {
 		const gnutls_datum_t *peer_cert_list;
 		unsigned int list_size;