# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1254758383 14400
# Node ID a3e16df805e3c42628baa0c552c2bd80d01d22c0
# Parent  2d4d9b0cdcc10dd0127b8219f315128f5997c4fc
master: Config file parsing fixes.

diff -r 2d4d9b0cdcc1 -r a3e16df805e3 src/master/master-settings.c
--- a/src/master/master-settings.c	Mon Oct 05 10:46:47 2009 -0400
+++ b/src/master/master-settings.c	Mon Oct 05 11:59:43 2009 -0400
@@ -1359,9 +1359,8 @@
 
 	if (type == NULL) {
 		/* section closing */
-		if (ctx->level-- > 0) {
+		if (--ctx->level > 0) {
 			ctx->type = ctx->parent_type;
-			ctx->protocol = MAIL_PROTOCOL_ANY;
 
 			switch (ctx->type) {
 			case SETTINGS_TYPE_AUTH_SOCKET:
@@ -1373,6 +1372,7 @@
 			}
 		} else {
 			ctx->type = SETTINGS_TYPE_ROOT;
+			ctx->protocol = MAIL_PROTOCOL_ANY;
 			ctx->server = ctx->root;
 			ctx->auth = &ctx->root->auth_defaults;
 			ctx->namespace = NULL;