dovecot-2.0: config: v1.x parser failed with some settings if pi...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/8f6703ce6528
changeset: 11732:8f6703ce6528
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jul 05 15:04:54 2010 +0100
description:
config: v1.x parser failed with some settings if pigeonhole wasn't installed.

diffstat:

 src/config/old-set-parser.c |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (39 lines):

diff -r d464e23e357c -r 8f6703ce6528 src/config/old-set-parser.c
--- 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;