Mercurial > dovecot > original-hg > dovecot-1.2

changeset 9026:cbeae4ef9af5 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed checking if protocols setting contains only invalid values.
author Timo Sirainen <tss@iki.fi>
date Wed, 13 May 2009 13:32:13 -0400
parents c741d2b135da
children 421393827a81
files src/master/master-settings.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
 {
 	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 @@
 		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);
 	}