]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
config: Fixed namespaces to work again
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Tue, 3 May 2016 17:15:23 +0000 (20:15 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Tue, 3 May 2016 17:15:23 +0000 (20:15 +0300)
Broken by 26a6ff7f0. old_settings_handle() should have returned FALSE for
settings it didn't handle.

src/config/old-set-parser.c

index b8503e7227294cae74649aaa485c8cb4f4fce2bb..aeaca8f6fadc52183a6f328247750abd949e37cb 100644 (file)
@@ -592,9 +592,7 @@ bool old_settings_handle(struct config_parser_context *ctx,
                        obsolete(ctx, "add auth_ prefix to all settings inside auth {} and remove the auth {} section completely");
                        ctx->old->auth_section = 1;
                        return TRUE;
-               } else if (ctx->pathlen == 0 && strcmp(key, "namespace") == 0)
-                       return TRUE;
-               else if (ctx->pathlen == 0 && strcmp(key, "protocol") == 0 &&
+               } else if (ctx->pathlen == 0 && strcmp(key, "protocol") == 0 &&
                         strcmp(value, "managesieve") == 0) {
                        obsolete(ctx, "protocol managesieve {} has been replaced by protocol sieve { }");
                        config_parser_apply_line(ctx, CONFIG_LINE_TYPE_SECTION_BEGIN,