changeset 19565:103896524313

*-login: Changed -D parameter to mean a more generic login_debug option.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Fri, 15 Jan 2016 15:55:26 +0200
parents 4d671a0e6219
children f395cd665008
files src/login-common/login-common.h src/login-common/main.c
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/login-common/login-common.h	Fri Jan 15 15:40:56 2016 +0200
+++ b/src/login-common/login-common.h	Fri Jan 15 15:55:26 2016 +0200
@@ -41,7 +41,7 @@
 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;
--- a/src/login-common/main.c	Fri Jan 15 15:40:56 2016 +0200
+++ b/src/login-common/main.c	Fri Jan 15 15:55:26 2016 +0200
@@ -35,7 +35,7 @@
 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 @@
 	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 @@
 	}
 
 	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 @@
 		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 @@
 	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 @@
 				    &global_ssl_settings,
 				    &global_other_settings);
 
-	main_preinit(allow_core_dumps);
+	main_preinit();
 	master_service_init_finish(master_service);
 	main_init(login_socket);