From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 15 Jan 2016 13:55:26 +0000 (+0200)
Subject: *-login: Changed -D parameter to mean a more generic login_debug option.
X-Git-Tag: 2.2.22.rc1~355
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa68ab23880118e31ba3acb75e342c6597e11a6a;p=thirdparty%2Fdovecot%2Fcore.git

*-login: Changed -D parameter to mean a more generic login_debug option.
---

diff --git a/src/login-common/login-common.h b/src/login-common/login-common.h
index 7ee011c35c..de405b8958 100644
--- a/src/login-common/login-common.h
+++ b/src/login-common/login-common.h
@@ -41,7 +41,7 @@ struct login_binary {
 extern const struct login_binary *login_binary;
 extern struct auth_client *auth_client;
 extern struct master_auth *master_auth;
-extern bool closing_down;
+extern bool closing_down, login_debug;
 extern struct anvil_client *anvil;
 extern const char *login_rawlog_dir;
 extern unsigned int initial_service_count;
diff --git a/src/login-common/main.c b/src/login-common/main.c
index b9f12358b3..7587f58abb 100644
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -35,7 +35,7 @@ struct login_access_lookup {
 const struct login_binary *login_binary;
 struct auth_client *auth_client;
 struct master_auth *master_auth;
-bool closing_down;
+bool closing_down, login_debug;
 struct anvil_client *anvil;
 const char *login_rawlog_dir = NULL;
 unsigned int initial_service_count;
@@ -302,7 +302,7 @@ parse_login_source_ips(const char *ips_str, unsigned int *count_r)
 	return array_get(&ips, count_r);
 }
 
-static void main_preinit(bool allow_core_dumps)
+static void main_preinit(void)
 {
 	unsigned int max_fds;
 
@@ -349,7 +349,7 @@ static void main_preinit(bool allow_core_dumps)
 	}
 
 	restrict_access_by_env(NULL, TRUE);
-	if (allow_core_dumps)
+	if (login_debug)
 		restrict_access_allow_coredumps(TRUE);
 	initial_service_count = master_service_get_service_count(master_service);
 
@@ -410,7 +410,6 @@ int login_binary_run(const struct login_binary *binary,
 		MASTER_SERVICE_FLAG_USE_SSL_SETTINGS |
 		MASTER_SERVICE_FLAG_NO_SSL_INIT;
 	pool_t set_pool;
-	bool allow_core_dumps = FALSE;
 	const char *login_socket;
 	int c;
 
@@ -427,7 +426,7 @@ int login_binary_run(const struct login_binary *binary,
 	while ((c = master_getopt(master_service)) > 0) {
 		switch (c) {
 		case 'D':
-			allow_core_dumps = TRUE;
+			login_debug = TRUE;
 			break;
 		case 'R':
 			login_rawlog_dir = optarg;
@@ -450,7 +449,7 @@ int login_binary_run(const struct login_binary *binary,
 				    &global_ssl_settings,
 				    &global_other_settings);
 
-	main_preinit(allow_core_dumps);
+	main_preinit();
 	master_service_init_finish(master_service);
 	main_init(login_socket);