]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-settings: Treat blocks with empty names as unique names, instead of merging them.
authorTimo Sirainen <tss@iki.fi>
Fri, 29 Jan 2010 08:10:07 +0000 (10:10 +0200)
committerTimo Sirainen <tss@iki.fi>
Fri, 29 Jan 2010 08:10:07 +0000 (10:10 +0200)
--HG--
branch : HEAD

src/lib-settings/settings-parser.c

index 9a17c30bbe9dd68809e680f3b70382658b9ce43f..f1ca733fa8da5f35480b3b21932bac20817c9842 100644 (file)
@@ -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];