From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 26 Jan 2023 10:59:47 +0000 (+0200)
Subject: login-common: Rename login_auth_socket_path to login_socket_path
X-Git-Tag: 2.4.0~3048
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed6e874f58632b31c8b407ccdb250667c3ccf9c8;p=thirdparty%2Fdovecot%2Fcore.git

login-common: Rename login_auth_socket_path to login_socket_path
---

diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c
index eae7b464ae..5213ace303 100644
--- a/src/login-common/login-settings.c
+++ b/src/login-common/login-settings.c
@@ -31,7 +31,7 @@ static const struct setting_define login_setting_defines[] = {
 	DEF(UINT, login_proxy_max_reconnects),
 	DEF(TIME, login_proxy_max_disconnect_delay),
 	DEF(STR, login_proxy_rawlog_dir),
-	DEF(STR, login_auth_socket_path),
+	DEF(STR, login_socket_path),
 
 	DEF(BOOL, auth_ssl_require_client_cert),
 	DEF(BOOL, auth_ssl_username_from_cert),
@@ -61,7 +61,7 @@ static const struct login_settings login_default_settings = {
 	.login_proxy_max_reconnects = 3,
 	.login_proxy_max_disconnect_delay = 0,
 	.login_proxy_rawlog_dir = "",
-	.login_auth_socket_path = "",
+	.login_socket_path = "",
 
 	.auth_ssl_require_client_cert = FALSE,
 	.auth_ssl_username_from_cert = FALSE,
diff --git a/src/login-common/login-settings.h b/src/login-common/login-settings.h
index 8b93cb5092..46071567f2 100644
--- a/src/login-common/login-settings.h
+++ b/src/login-common/login-settings.h
@@ -17,7 +17,7 @@ struct login_settings {
 	unsigned int login_proxy_max_reconnects;
 	unsigned int login_proxy_max_disconnect_delay;
 	const char *login_proxy_rawlog_dir;
-	const char *login_auth_socket_path;
+	const char *login_socket_path;
 	const char *ssl; /* for settings check */
 
 	bool auth_ssl_require_client_cert;
diff --git a/src/login-common/main.c b/src/login-common/main.c
index 80376a226d..63ac7f9182 100644
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -508,8 +508,8 @@ int login_binary_run(struct login_binary *binary,
 
 	if (argv[optind] != NULL)
 		login_socket = argv[optind];
-	else if (global_login_settings->login_auth_socket_path[0] != '\0')
-		login_socket = global_login_settings->login_auth_socket_path;
+	else if (global_login_settings->login_socket_path[0] != '\0')
+		login_socket = global_login_settings->login_socket_path;
 
 	main_preinit();
 	main_init(login_socket);