dovecot-2.0-sslstream: settings parser: Allow multiple strlist b...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/dfbdb1e8deb6
changeset: 10241:dfbdb1e8deb6
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Oct 30 15:12:33 2009 -0400
description:
settings parser: Allow multiple strlist blocks with same name. They just get merged.

diffstat:

1 file changed, 3 insertions(+), 3 deletions(-)
src/lib-settings/settings-parser.c |    6 +++---

diffs (16 lines):

diff -r 83464a815f46 -r dfbdb1e8deb6 src/lib-settings/settings-parser.c
--- a/src/lib-settings/settings-parser.c	Fri Oct 30 15:06:38 2009 -0400
+++ b/src/lib-settings/settings-parser.c	Fri Oct 30 15:12:33 2009 -0400
@@ -344,9 +344,9 @@ static int setting_link_add(struct setti
 
 	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);