From: Timo Sirainen <tss@iki.fi>
Date: Sat, 5 Mar 2011 11:36:19 +0000 (+0200)
Subject: auth: Fixed ldap assert-crash.
X-Git-Tag: 2.0.11~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baa6930bf0103e276355a81f187e5f7c69cf23f2;p=thirdparty%2Fdovecot%2Fcore.git

auth: Fixed ldap assert-crash.
---

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 5d6a490e73..7db0cb3b81 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1174,12 +1174,12 @@ static bool db_ldap_result_int_next(struct db_ldap_result_iterate_context *ctx)
 	const char *p;
 
 	while (ctx->attr != NULL) {
-		/* a new attribute */
-		db_ldap_result_change_attr(ctx);
-
-		if (ctx->vals != NULL) {
-			db_ldap_result_return_value(ctx);
-			return TRUE;
+		if (ctx->vals == NULL) {
+			db_ldap_result_change_attr(ctx);
+			if (ctx->vals != NULL) {
+				db_ldap_result_return_value(ctx);
+				return TRUE;
+			}
 		}
 
 		ldap_value_free(ctx->vals); ctx->vals = NULL;