talons

commit db6714b90f8c3ac5caced3fd37455d6288fa47fb
parent 36592edeead4c60f8788f900f2a9c199413dd6b6
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 28 Jul 2009 18:39:47 +0000

2009-07-28 [colin]	3.7.2cvs14

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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/ldapquery.c
 | 
2
+-

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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 {