forked from pool/openldap2
7341d09271
- updated to 2.4.50 - added 0014-ITS-8650-fix-debug-usage.patch - enabled new contrib overlay pw-argon2 - replaced FTP by HTTPS download URL for source - removed 0009-Fix-ldap-host-lookup-ipv6.patch (see bsc#1171127) OBS-URL: https://build.opensuse.org/request/show/800820 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=258
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From 85fc8974f5c32a9a052baafaa9499c8484e043c2 Mon Sep 17 00:00:00 2001
|
|
From: Quanah Gibson-Mount <quanah@openldap.org>
|
|
Date: Tue, 28 Apr 2020 20:49:53 +0000
|
|
Subject: ITS#8650 - Fix Debug usage to follow RE24 format
|
|
|
|
|
|
diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
|
|
index c1f15cbc1..ebe5bf125 100644
|
|
--- a/libraries/libldap/tls2.c
|
|
+++ b/libraries/libldap/tls2.c
|
|
@@ -907,8 +907,8 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
|
|
} else if ( sb->sb_trans_needs_write ) {
|
|
wr=1;
|
|
}
|
|
- Debug1( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ldap_int_tls_connect needs %s\n",
|
|
- wr ? "write": "read" );
|
|
+ Debug( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ldap_int_tls_connect needs %s\n",
|
|
+ wr ? "write": "read", 0, 0 );
|
|
|
|
/* This is mostly copied from result.c:wait4msg(), should
|
|
* probably be moved into a separate function */
|
|
@@ -946,7 +946,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
|
|
start_time_tv.tv_sec = curr_time_tv.tv_sec;
|
|
start_time_tv.tv_usec = curr_time_tv.tv_usec;
|
|
tv = tv0;
|
|
- Debug3( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ld %p %ld s %ld us to go\n",
|
|
+ Debug( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ld %p %ld s %ld us to go\n",
|
|
(void *)ld, (long) tv.tv_sec, (long) tv.tv_usec );
|
|
ret = ldap_int_poll( ld, sd, &tv, wr);
|
|
if ( ret < 0 ) {
|