From 8505f774a55b99364e64d99c2f8ef71edb5f2769 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 20 Apr 2020 19:37:06 +0000 Subject: [PATCH] Update to drop NON_BLOCKING ifdefs that were only really for moznss --- libraries/libldap/tls2.c | 9 --------- libraries/libldap/tls_o.c | 12 ------------ 2 files changed, 21 deletions(-) diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c index 9df37069ee..79a651a380 100644 --- a/libraries/libldap/tls2.c +++ b/libraries/libldap/tls2.c @@ -43,8 +43,6 @@ static tls_impl *tls_imp = &ldap_int_tls_impl; #endif /* HAVE_TLS */ -#define LDAP_USE_NON_BLOCKING_TLS - /* RFC2459 minimum required set of supported attribute types * in a certificate DN */ @@ -1049,10 +1047,8 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv ) char *host; void *ssl; int ret, async; -#ifdef LDAP_USE_NON_BLOCKING_TLS struct timeval start_time_tv, tv, tv0; ber_socket_t sd = AC_SOCKET_ERROR; -#endif /* LDAP_USE_NON_BLOCKING_TLS */ if ( !conn ) return LDAP_PARAM_ERROR; @@ -1071,7 +1067,6 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv ) (void) tls_init( tls_imp ); -#ifdef LDAP_USE_NON_BLOCKING_TLS /* * Use non-blocking io during SSL Handshake when a timeout is configured */ @@ -1092,8 +1087,6 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv ) #endif /* ! HAVE_GETTIMEOFDAY */ } -#endif /* LDAP_USE_NON_BLOCKING_TLS */ - ld->ld_errno = LDAP_SUCCESS; ret = ldap_int_tls_connect( ld, conn, host ); @@ -1102,7 +1095,6 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv ) * big for a single network message. */ while ( ret > 0 ) { -#ifdef LDAP_USE_NON_BLOCKING_TLS if ( async ) { struct timeval curr_time_tv, delta_tv; int wr=0; @@ -1159,7 +1151,6 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv ) break; } } -#endif /* LDAP_USE_NON_BLOCKING_TLS */ ret = ldap_int_tls_connect( ld, conn, host ); } diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c index e52c5507c5..cf97d76325 100644 --- a/libraries/libldap/tls_o.c +++ b/libraries/libldap/tls_o.c @@ -530,18 +530,6 @@ tlso_session_connect( LDAP *ld, tls_session *sess ) /* Caller expects 0 = success, OpenSSL returns 1 = success */ int rc = SSL_connect( s ) - 1; -#ifdef LDAP_USE_NON_BLOCKING_TLS - if ( rc < 0 ) { - int sockerr = sock_errno(); - int sslerr = SSL_get_error( s, rc+1 ); - if ( sslerr == SSL_ERROR_WANT_READ || sslerr == SSL_ERROR_WANT_WRITE ) { - rc = 0; - } else if ( sslerr == SSL_ERROR_SYSCALL && - ( sockerr == EAGAIN || sockerr == ENOTCONN )) { - rc = 0; - } - } -#endif /* LDAP_USE_NON_BLOCKING_TLS */ return rc; }