Mercurial > dovecot > core-2.2
changeset 11732:8f6703ce6528 HEAD
config: v1.x parser failed with some settings if pigeonhole wasn't installed.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 05 Jul 2010 15:04:54 +0100 |
| parents | d464e23e357c |
| children | 529e85c548a9 |
| files | src/config/old-set-parser.c |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/config/old-set-parser.c Mon Jul 05 13:28:17 2010 +0100 +++ b/src/config/old-set-parser.c Mon Jul 05 15:04:54 2010 +0100 @@ -180,8 +180,11 @@ t_strdup_printf("service/pop3-login/%s=%s", key, value), NULL); } if (config_filter_match(&old_section->filter, &managesieve_filter)) { + /* if pigeonhole isn't installed, this fails. + just ignore it then.. */ config_apply_line(ctx, key, t_strdup_printf("service/managesieve-login/%s=%s", key, value), NULL); + ctx->error = NULL; } } @@ -203,6 +206,7 @@ if (config_filter_match(&old_section->filter, &managesieve_filter)) { config_apply_line(ctx, key, t_strdup_printf("service/managesieve/%s=%s", key,value), NULL); + ctx->error = NULL; } } @@ -272,6 +276,7 @@ config_filter_match(&old_section->filter, &managesieve_filter)) { config_apply_line(ctx, "port", t_strdup_printf("service/managesieve-login/inet_listener/managesieve/port=%s", p), NULL); + ctx->error = NULL; } } if (root && *ssl == '\0') { @@ -291,6 +296,7 @@ config_filter_match(&old_section->filter, &managesieve_filter)) { config_apply_line(ctx, "address", t_strdup_printf("service/managesieve-login/inet_listener/managesieve/address=%s", value), NULL); + ctx->error = NULL; } } return TRUE;