Commit 315c8e08 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6079

parent 38d40c4f
......@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.17 Engineering
Fixed liblber to use ber_strnlen (ITS#6080)
Fixed libldap gnutls private key init (ITS#6053)
Fixed libldap tls NULL error messages (ITS#6079)
Fixed liblutil opendir/closedir on windows (ITS#6041)
Fixed liblutil for _GNU_SOURCE (ITS#5464,ITS#5666)
Fixed slapd errno handling (ITS#6037)
......
......@@ -75,6 +75,9 @@
#ifdef LDAP_DEBUG
#define DebugTest( level ) \
( ldap_debug & level )
#define Debug( level, fmt, arg1, arg2, arg3 ) \
do { if ( ldap_debug & level ) \
ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) ); \
......@@ -85,6 +88,7 @@
#else
#define DebugTest( level ) (0 == 1)
#define Debug( level, fmt, arg1, arg2, arg3 ) ((void)0)
#define LDAP_Debug( subsystem, level, fmt, arg1, arg2, arg3 ) ((void)0)
......
......@@ -434,11 +434,14 @@ ldap_pvt_tls_accept( Sockbuf *sb, void *ctx_arg )
if ( err < 0 )
{
char buf[256];
if ( update_flags( sb, ssl, err )) return 1;
Debug( LDAP_DEBUG_ANY,"TLS: can't accept: %s.\n",
tls_imp->ti_session_errmsg( err, buf, sizeof(buf) ),0,0 );
if ( DebugTest( LDAP_DEBUG_ANY ) ) {
char buf[256], *msg;
msg = tls_imp->ti_session_errmsg( err, buf, sizeof(buf) );
Debug( LDAP_DEBUG_ANY,"TLS: can't accept: %s.\n",
msg ? msg : "(unknown)", 0, 0 );
}
ber_sockbuf_remove_io( sb, tls_imp->ti_sbio,
LBER_SBIOD_LEVEL_TRANSPORT );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment