From: Timo Sirainen <tss@iki.fi>
Date: Fri, 29 Jan 2010 08:10:07 +0000 (+0200)
Subject: lib-settings: Treat blocks with empty names as unique names, instead of merging them.
X-Git-Tag: 2.0.beta2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71ba7159eb8598fb08edc7440b0c3c70dbbb14ac;p=thirdparty%2Fdovecot%2Fcore.git

lib-settings: Treat blocks with empty names as unique names, instead of merging them.

--HG--
branch : HEAD
---

diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index 9a17c30bbe..f1ca733fa8 100644
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -1649,7 +1649,7 @@ settings_copy_deflist_unique(const struct setting_define *def,
 				break;
 		}
 
-		if (j < dest_count) {
+		if (j < dest_count && **src_namep != '\0') {
 			/* merge */
 			child_src_link.set_struct = src_children[i];
 			child_src_link.change_struct = src_cchildren[i];