From: Timo Sirainen <tss@iki.fi>
Date: Fri, 30 Oct 2009 19:12:33 +0000 (-0400)
Subject: settings parser: Allow multiple strlist blocks with same name. They just get merged.
X-Git-Tag: 2.0.alpha3~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e2d1e68cf594ad81cb824dfc11356e82f704322;p=thirdparty%2Fdovecot%2Fcore.git

settings parser: Allow multiple strlist blocks with same name. They just get merged.

--HG--
branch : HEAD
---

diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index d6f835c090..f38904b1fc 100644
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -344,9 +344,9 @@ static int setting_link_add(struct setting_parser_context *ctx,
 
 	link = hash_table_lookup(ctx->links, key);
 	if (link != NULL) {
-		if (def != NULL && def->type == SET_DEFLIST_UNIQUE &&
-		    link->parent == link_copy->parent &&
-		    link->info == link_copy->info)
+		if (link->parent == link_copy->parent &&
+		    link->info == link_copy->info &&
+		    (def == NULL || def->type == SET_DEFLIST_UNIQUE))
 			return 0;
 		ctx->error = p_strconcat(ctx->parser_pool, key,
 					 " already exists", NULL);