From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 3 Feb 2016 12:00:16 +0000 (+0200)
Subject: *-login: Added -l parameter to specify the socket where to connect to after authentic... 
X-Git-Tag: 2.2.22.rc1~215
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74ad0b983315f72f26e01f7a1d227e70e2b841ce;p=thirdparty%2Fdovecot%2Fcore.git

*-login: Added -l parameter to specify the socket where to connect to after authentication
---

diff --git a/src/login-common/main.c b/src/login-common/main.c
index d229e5cc71..ddeb9dd721 100644
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -51,6 +51,7 @@ unsigned int login_source_ips_idx, login_source_ips_count;
 
 static struct module *modules;
 static struct timeout *auth_client_to;
+static const char *post_login_socket;
 static bool shutting_down = FALSE;
 static bool ssl_connections = FALSE;
 static bool auth_connected_once = FALSE;
@@ -403,7 +404,7 @@ static void main_init(const char *login_socket)
 	auth_client = auth_client_init(login_socket, (unsigned int)getpid(),
 				       FALSE);
         auth_client_set_connect_notify(auth_client, auth_connect_notify, NULL);
-	master_auth = master_auth_init(master_service, login_binary->protocol);
+	master_auth = master_auth_init(master_service, post_login_socket);
 
 	login_binary->init();
 	login_proxy_init("proxy-notify");
@@ -441,10 +442,11 @@ int login_binary_run(const struct login_binary *binary,
 	login_binary = binary;
 	login_socket = binary->default_login_socket != NULL ?
 		binary->default_login_socket : LOGIN_DEFAULT_SOCKET;
+	post_login_socket = binary->protocol;
 
 	master_service = master_service_init(login_binary->process_name,
 					     service_flags, &argc, &argv,
-					     "DR:S");
+					     "Dl:R:S");
 	master_service_init_log(master_service, t_strconcat(
 		login_binary->process_name, ": ", NULL));
 
@@ -453,6 +455,9 @@ int login_binary_run(const struct login_binary *binary,
 		case 'D':
 			login_debug = TRUE;
 			break;
+		case 'l':
+			post_login_socket = optarg;
+			break;
 		case 'R':
 			login_rawlog_dir = optarg;
 			break;