2007-08-22 [colin] 2.10.0cvs152

	* src/ldapserver.c
		Set tv_usec too

diff --git a/ChangeLog b/ChangeLog
index b0172d674e5ade82cac75aa8e094f5275d67161f..9def25b5062fa4a280875cf5c1e4f4bd99b6eea5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-22 [colin]     2.10.0cvs152
+
+       * src/ldapserver.c
+               Set tv_usec too
+
 2007-08-22 [wwp]       2.10.0cvs151
 
        * src/ldapquery.c

diff --git a/PATCHSETS b/PATCHSETS
index bac8cf56fbf0fd96549c94ee4261838ce215db61..3f62045704a9e14a13684499e4dc3a9279228a3b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2806,3 +2806,4 @@
 ( cvs diff -u -r 1.3.2.24 -r 1.3.2.25 src/ldapquery.c;  ) > 2.10.0cvs149.patchset
 ( cvs diff -u -r 1.8.2.28 -r 1.8.2.29 src/editldap.c;  cvs diff -u -r 1.10.2.12 -r 1.10.2.13 src/editldap_basedn.c;  cvs diff -u -r 1.3.2.25 -r 1.3.2.26 src/ldapquery.c;  cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/ldapserver.c;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/ldapserver.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/ldapupdate.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/ldaputil.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/ldaputil.h;  ) > 2.10.0cvs150.patchset
 ( cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/ldapquery.c;  ) > 2.10.0cvs151.patchset
+( cvs diff -u -r 1.4.2.15 -r 1.4.2.16 src/ldapserver.c;  ) > 2.10.0cvs152.patchset

diff --git a/configure.ac b/configure.ac
index 0e2a551ffe100f98b37e572df77c509c84586051..9e504962e80a0977a3326e2c5a5f2062f30333fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=151
+EXTRA_VERSION=152
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/ldapserver.c b/src/ldapserver.c
index 1a987ee2fb0023922f01c27650b9c4b140b65cb4..f284c2d4e2d4d767be9b7a641adbb2844f3b5721 100644 (file)
--- a/src/ldapserver.c
+++ b/src/ldapserver.c
@@ -722,6 +722,7 @@ void ldapsrv_set_options (gint secs, LDAP *ld)
        int i = LDAP_OPT_X_TLS_ALLOW;
        int rc;
        timeout.tv_sec = secs;
+       timeout.tv_usec = 0;
        rc=ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &i);
        debug_print("cert %s\n", ldap_err2string(rc));