X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fldapupdate.c;h=d8425c67c357ab7cea127572e5d6dcc8b0b5e99c;hp=47472ca989e9679e76ef6e5a37b37bb5d5054f1a;hb=cc805ae1d452897db93307213e1068145f02954c;hpb=cc1e667dfd6efb402c96387adf154afb0b4cddc6

diff --git a/src/ldapupdate.c b/src/ldapupdate.c
index 47472ca98..d8425c67c 100644
--- a/src/ldapupdate.c
+++ b/src/ldapupdate.c
@@ -930,7 +930,7 @@ void ldapsvr_handle_other_attributes(LDAP *ld, LdapServer *server, char *dn, GHa
 		}
 		node = g_list_next(node);
 	}
-	char **attribs = ldapctl_attribute_array(server->control);
+	char **attribs = ldapctl_full_attribute_array(server->control);
 	for (i = 0; i < ATTRIBUTE_SIZE; i++) {
 		/* Attributes which holds no information are to be removed */
 		if (CHECKED_ATTRIBUTE[i] == FALSE) {
@@ -967,11 +967,7 @@ void ldapsvr_handle_other_attributes(LDAP *ld, LdapServer *server, char *dn, GHa
 		}
 	}
 	else {
-		/* Only consider those attributes which is currently part of the search criteria.
-		 * If attributes are not part of the search criteria they would seem to hold
-		 * no information since their values will not be populated in the GUI
-		 */
-		char **attribs = ldapctl_attribute_array(server->control);
+		char **attribs = ldapctl_full_attribute_array(server->control);
 		for (i = 0; i < ATTRIBUTE_SIZE; i++) {
 			if (ldapsvr_check_search_attributes(attribs, (char *) ATTRIBUTE[i])) {
 				if (CHECKED_ATTRIBUTE[i] == FALSE) {