2009-08-18 [colin] 3.7.2cvs17

[claws.git] / src / ldapquery.c

diff --git a/src/ldapquery.c b/src/ldapquery.c
index d7597c47507e898195523526a9a492ff012dc0bb..b1d32300e1ef3eed92d4856a92bf2caf63cdba86 100644 (file)
--- a/src/ldapquery.c
+++ b/src/ldapquery.c
@@ -804,7 +804,7 @@ static gint ldapqry_disconnect( LdapQuery *qry ) {
 static gint ldapqry_search_retrieve( LdapQuery *qry ) {
        LdapControl *ctl;
        LDAP *ld;
-       LDAPMessage *result, *e = NULL;
+       LDAPMessage *result = NULL, *e = NULL;
        char **attribs;
        gchar *criteria;
        gboolean searchFlag;
@@ -856,7 +856,7 @@ static gint ldapqry_search_retrieve( LdapQuery *qry ) {
        else if( rc == LDAP_SUCCESS ) {
                searchFlag = TRUE;
        }
-       else if( rc == LDAP_PARTIAL_RESULTS || ldap_count_entries(ld, result) > 0 ) {
+       else if( rc == LDAP_PARTIAL_RESULTS || (result && ldap_count_entries(ld, result) > 0) ) {
                searchFlag = TRUE;
        }
        else {