From 71ba7159eb8598fb08edc7440b0c3c70dbbb14ac Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 29 Jan 2010 10:10:07 +0200 Subject: [PATCH] lib-settings: Treat blocks with empty names as unique names, instead of merging them. --HG-- branch : HEAD --- src/lib-settings/settings-parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]; -- 2.47.3