dovecot-2.1: Compiler warning fix

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/b8e1c9685c69
changeset: 13758:b8e1c9685c69
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Nov 23 21:14:11 2011 +0200
description:
Compiler warning fix

diffstat:

 src/master/master-settings.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (63 lines):

diff -r 49044b7cfa3d -r b8e1c9685c69 src/master/master-settings.c
--- a/src/master/master-settings.c	Wed Nov 23 20:31:40 2011 +0200
+++ b/src/master/master-settings.c	Wed Nov 23 21:14:11 2011 +0200
@@ -402,11 +402,6 @@
 master_settings_verify(void *_set, pool_t pool, const char **error_r)
 {
 	static int warned_auth = FALSE, warned_anvil = FALSE;
-#ifdef CONFIG_BINARY
-	const struct service_settings *default_service;
-#else
-	rlim_t fd_limit;
-#endif
 	struct master_settings *set = _set;
 	struct service_settings *const *services;
 	const char *const *strings;
@@ -414,8 +409,13 @@
 	struct passwd pw;
 	unsigned int i, j, count, len, client_limit, process_limit;
 	unsigned int max_auth_client_processes, max_anvil_client_processes;
+#ifdef CONFIG_BINARY
+	const struct service_settings *default_service;
+#else
+	rlim_t fd_limit;
 	const char *max_client_limit_source = "default_client_count";
-	unsigned int max_client_limit;
+	unsigned int max_client_limit = set->default_client_limit;
+#endif
 
 	len = strlen(set->base_dir);
 	if (len > 0 && set->base_dir[len-1] == '/') {
@@ -489,7 +489,6 @@
 		}
 	}
 	t_array_init(&all_listeners, 64);
-	max_client_limit = set->default_client_limit;
 	max_auth_client_processes = 0;
 	max_anvil_client_processes = 2; /* blocking, nonblocking pipes */
 	for (i = 0; i < count; i++) {
@@ -531,11 +530,6 @@
 				"vsz_limit is too low", service->name);
 			return FALSE;
 		}
-		if (max_client_limit < service->client_limit) {
-			max_client_limit = service->client_limit;
-			max_client_limit_source = t_strdup_printf(
-				"service %s { client_limit }", service->name);
-		}
 
 #ifdef CONFIG_BINARY
 		default_service =
@@ -546,6 +540,12 @@
 				"process_limit must be 1", service->name);
 			return FALSE;
 		}
+#else
+		if (max_client_limit < service->client_limit) {
+			max_client_limit = service->client_limit;
+			max_client_limit_source = t_strdup_printf(
+				"service %s { client_limit }", service->name);
+		}
 #endif
 
 		if (*service->protocol != '\0' &&