2009-07-28 [colin] 3.7.2cvs14

	* src/ldapquery.c
		Fix bug 1957, 'LDAP errs out after searching too
		many search bases'

diff --git a/ChangeLog b/ChangeLog
index 331d78329dc8431c41e45e06cebe08652c9de90a..5abba43ac6228e41e615e79bf176b3a5500a53a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-28 [colin]     3.7.2cvs14
+
+       * src/ldapquery.c
+               Fix bug 1957, 'LDAP errs out after searching too 
+               many search bases'
+
 2009-07-28 [colin]     3.7.2cvs13
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index e0b73e7d657d2e1ac67e8f10e554d72e115ab56c..550cd996f1b9585c482045e046538b01c0629a4f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3838,3 +3838,4 @@
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 manual/plugins.xml;  ) > 3.7.2cvs11.patchset
 ( cvs diff -u -r 1.23.2.23 -r 1.23.2.24 src/common/session.c;  ) > 3.7.2cvs12.patchset
 ( cvs diff -u -r 1.395.2.414 -r 1.395.2.415 src/summaryview.c;  ) > 3.7.2cvs13.patchset
+( cvs diff -u -r 1.3.2.31 -r 1.3.2.32 src/ldapquery.c;  ) > 3.7.2cvs14.patchset

diff --git a/configure.ac b/configure.ac
index f010a6e9bd5a1f333b0974911a316d4112a85a6a..6aebdde11e28766b7ffdf34279d4728ca017e943 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/ldapquery.c b/src/ldapquery.c
index 70af9f3a94c6804074443058b07cc61e072883ec..d7597c47507e898195523526a9a492ff012dc0bb 100644 (file)
--- a/src/ldapquery.c
+++ b/src/ldapquery.c
@@ -856,7 +856,7 @@ static gint ldapqry_search_retrieve( LdapQuery *qry ) {
        else if( rc == LDAP_SUCCESS ) {
                searchFlag = TRUE;
        }
-       else if( rc == LDAP_PARTIAL_RESULTS ) {
+       else if( rc == LDAP_PARTIAL_RESULTS || ldap_count_entries(ld, result) > 0 ) {
                searchFlag = TRUE;
        }
        else {