mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to drop NON_BLOCKING ifdefs that were only really for moznss

Browse Source
This commit is contained in:
Quanah Gibson-Mount 2020-04-20 19:37:06 +00:00
parent a019e7fe1a
commit 8505f774a5
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/libldap/tls2.c
View File

@ -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 );
}

12
libraries/libldap/tls_o.c
View File

@ -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;
}