2007-08-22 [colin] 2.10.0cvs147

	* src/ldaputil.c
		Fix test (set ldap v3 if bindDN is set or TLS is set)

diff --git a/ChangeLog b/ChangeLog
index c0f235652ad4d7b1a712b37dd0452f5ea5e13cb2..09cd74412bd1ac875e6c8a934fae20b711a519d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-22 [colin]     2.10.0cvs147
+
+       * src/ldaputil.c
+               Fix test (set ldap v3 if bindDN is set or TLS is set)
+

 2007-08-22 [colin]     2.10.0cvs146
 
        * src/editldap.c
 2007-08-22 [colin]     2.10.0cvs146
 
        * src/editldap.c

diff --git a/PATCHSETS b/PATCHSETS
index 546ca29319b9a8a4a23e6240f7ca8a0651cbcd68..3215364301d0ef1639fe911c13c3270969d08e8c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2801,3 +2801,4 @@
 ( cvs diff -u -r 1.105.2.108 -r 1.105.2.109 src/prefs_account.c;  ) > 2.10.0cvs144.patchset
 ( cvs diff -u -r 1.2.4.19 -r 1.2.4.20 src/browseldap.c;  cvs diff -u -r 1.8.2.26 -r 1.8.2.27 src/editldap.c;  cvs diff -u -r 1.2.2.14 -r 1.2.2.15 src/ldapctrl.c;  cvs diff -u -r 1.3.2.22 -r 1.3.2.23 src/ldapquery.c;  cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/ldapserver.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/ldapupdate.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/ldaputil.c;  ) > 2.10.0cvs145.patchset
 ( cvs diff -u -r 1.8.2.27 -r 1.8.2.28 src/editldap.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/ldaputil.c;  ) > 2.10.0cvs146.patchset
 ( cvs diff -u -r 1.105.2.108 -r 1.105.2.109 src/prefs_account.c;  ) > 2.10.0cvs144.patchset
 ( cvs diff -u -r 1.2.4.19 -r 1.2.4.20 src/browseldap.c;  cvs diff -u -r 1.8.2.26 -r 1.8.2.27 src/editldap.c;  cvs diff -u -r 1.2.2.14 -r 1.2.2.15 src/ldapctrl.c;  cvs diff -u -r 1.3.2.22 -r 1.3.2.23 src/ldapquery.c;  cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/ldapserver.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/ldapupdate.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/ldaputil.c;  ) > 2.10.0cvs145.patchset
 ( cvs diff -u -r 1.8.2.27 -r 1.8.2.28 src/editldap.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/ldaputil.c;  ) > 2.10.0cvs146.patchset

+( cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/ldaputil.c;  ) > 2.10.0cvs147.patchset

diff --git a/configure.ac b/configure.ac
index d6c55a35440cd01755dc7bc82b38beba7395e6ea..17aca3e3e1bfa8b1e9d6753b0c13be0259fa6f25 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=146
+EXTRA_VERSION=147

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/ldaputil.c b/src/ldaputil.c
index 202ddf10fe1975a6e68c0bfe8d9a3f244229256f..2ed824c68de02cd44898f4831808ed2c10463a75 100644 (file)
--- a/src/ldaputil.c
+++ b/src/ldaputil.c
@@ -247,11 +247,17 @@ GList *ldaputil_read_basedn(
        if( ld == NULL ) {
                return baseDN;
        }
        if( ld == NULL ) {
                return baseDN;
        }

+
+       if ((bindDN && *bindDN)

 #ifdef USE_LDAP_TLS
 #ifdef USE_LDAP_TLS

-       if (bindDN && *bindDN) {
+          || (tls && !ssl)
+#endif                 
+       ) {

                version = LDAP_VERSION3;
                rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
        }
                version = LDAP_VERSION3;
                rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
        }

+#ifdef USE_LDAP_TLS
+       

        if( tls && !ssl ) {
                /* Handle TLS */
                if( rc != LDAP_OPT_SUCCESS ) {
        if( tls && !ssl ) {
                /* Handle TLS */
                if( rc != LDAP_OPT_SUCCESS ) {