[dovecot-cvs] dovecot/src/master master-settings.c,1.137,1.138

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv19715

Modified Files:
	master-settings.c 
Log Message:
Allow empty protocols line when using --exec-mail.



Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- master-settings.c	10 Aug 2006 18:52:39 -0000	1.137
+++ master-settings.c	10 Aug 2006 19:15:43 -0000	1.138
@@ -539,6 +539,11 @@
 
 static bool settings_is_active(struct settings *set)
 {
+	if (*set->protocols == '\0') {
+		/* we're probably using this with --exec-mail */
+		return TRUE;
+	}
+
 	if (set->protocol == MAIL_PROTOCOL_IMAP) {
 		if (strstr(set->protocols, "imap") == NULL)
 			return FALSE;
@@ -1389,6 +1394,8 @@
 		}
 	}
 
+	i_assert(ctx.root != NULL);
+
 	/* settings ok, swap them */
 	temp = settings_pool;
 	settings_pool = settings2_pool;