From c62770358399c4b2dbe1e6c5c238c1ccf04bf243 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 19 Dec 2010 08:50:39 +0000 Subject: [PATCH] 2010-12-19 [colin] 3.7.8cvs11 * src/ldapserver.c Better debug. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/ldapserver.c | 10 ++++++++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9813a616c..884bbb929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-12-19 [colin] 3.7.8cvs11 + + * src/ldapserver.c + Better debug. + 2010-12-18 [colin] 3.7.8cvs10 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index cb1ec8c48..ff3fc2feb 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4084,3 +4084,4 @@ ( cvs diff -u -r 1.654.2.4156 -r 1.654.2.4157 configure.ac; cvs diff -u -r 1.8.2.38 -r 1.8.2.39 src/editldap.c; cvs diff -u -r 1.3.2.36 -r 1.3.2.37 src/ldapquery.c; cvs diff -u -r 1.4.2.20 -r 1.4.2.21 src/ldapserver.c; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/ldapupdate.c; cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/ldaputil.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/ldaputil.h; ) > 3.7.8cvs8.patchset ( cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/ldaputil.c; ) > 3.7.8cvs9.patchset ( cvs diff -u -r 1.382.2.561 -r 1.382.2.562 src/compose.c; ) > 3.7.8cvs10.patchset +( cvs diff -u -r 1.4.2.21 -r 1.4.2.22 src/ldapserver.c; ) > 3.7.8cvs11.patchset diff --git a/configure.ac b/configure.ac index 5cda4deb2..8a541616d 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=8 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=10 +EXTRA_VERSION=11 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/ldapserver.c b/src/ldapserver.c index 66eb975f4..cd8fa325a 100644 --- a/src/ldapserver.c +++ b/src/ldapserver.c @@ -724,10 +724,16 @@ void ldapsrv_set_options (gint secs, LDAP *ld) #ifdef G_OS_UNIX i = LDAP_OPT_X_TLS_ALLOW; rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &i); - debug_print("cert %s\n", ldaputil_get_error(ld)); + if (ld) + debug_print("cert %s\n", ldaputil_get_error(ld)); + else + debug_print("cert %s\n", ldap_err2string(rc)); /* can crash old libldaps... */ rc = ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, &timeout); - debug_print("tm %s\n", ldaputil_get_error(ld)); + if (ld) + debug_print("tm %s\n", ldaputil_get_error(ld)); + else + debug_print("tm %s\n", ldap_err2string(rc)); #endif } -- 2.25.1