dovecot-1.2: Fixed checking if protocols setting contains only i...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/cbeae4ef9af5
changeset: 9026:cbeae4ef9af5
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 13 13:32:13 2009 -0400
description:
Fixed checking if protocols setting contains only invalid values.

diffstat:

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

diffs (25 lines):

diff -r c741d2b135da -r cbeae4ef9af5 src/master/master-settings.c
--- a/src/master/master-settings.c	Wed May 13 12:40:58 2009 -0400
+++ b/src/master/master-settings.c	Wed May 13 13:32:13 2009 -0400
@@ -1520,6 +1520,7 @@ bool master_settings_read(const char *pa
 {
 	struct settings_parse_ctx ctx;
 	struct server_settings *server, *prev;
+	const struct settings *def;
 	struct auth_settings *auth;
 	struct namespace_settings *ns;
 	pool_t temp;
@@ -1548,11 +1549,10 @@ bool master_settings_read(const char *pa
 		ctx.root = ctx.root->next;
 
 	if (!nochecks && !nofixes) {
-		ctx.root->defaults = settings_is_active(ctx.root->imap) ?
+		def = settings_is_active(ctx.root->imap) ?
 			ctx.root->imap : ctx.root->pop3;
 
-		path = t_strconcat(ctx.root->defaults->base_dir,
-				   "/master.pid", NULL);
+		path = t_strconcat(def->base_dir, "/master.pid", NULL);
 		pid_file_check_running(path);
 	}