From: Timo Sirainen <tss@iki.fi>
Date: Thu, 11 Oct 2012 22:21:30 +0000 (+0300)
Subject: imap: Don't waste data stack memory at startup.
X-Git-Tag: 2.2.alpha1~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ee25b3a5839420707c11d6fc0131663a657096;p=thirdparty%2Fdovecot%2Fcore.git

imap: Don't waste data stack memory at startup.
---

diff --git a/src/imap/main.c b/src/imap/main.c
index 611b7b9b24..0362532cf1 100644
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -362,12 +362,6 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	login_set.auth_socket_path = t_abspath("auth-master");
-	if (argv[optind] != NULL)
-		login_set.postlogin_socket_path = t_abspath(argv[optind]);
-	login_set.callback = login_client_connected;
-	login_set.failure_callback = login_client_failed;
-
 	master_service_init_finish(master_service);
 	master_service_set_die_callback(master_service, imap_die);
 
@@ -387,10 +381,18 @@ int main(int argc, char *argv[])
 		T_BEGIN {
 			main_stdio_run(username);
 		} T_END;
-	} else {
+	} else T_BEGIN {
+		login_set.auth_socket_path = t_abspath("auth-master");
+		if (argv[optind] != NULL) {
+			login_set.postlogin_socket_path =
+				t_abspath(argv[optind]);
+		}
+		login_set.callback = login_client_connected;
+		login_set.failure_callback = login_client_failed;
+
 		master_login = master_login_init(master_service, &login_set);
 		io_loop_set_running(current_ioloop);
-	}
+	} T_END;
 
 	if (io_loop_is_running(current_ioloop))
 		master_service_run(master_service, client_connected);