From: Timo Sirainen Date: Mon, 20 Apr 2020 09:26:06 +0000 (+0300) Subject: *-login: Change struct login_binary to be non-const X-Git-Tag: 2.3.11.2~226 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd1cdc586cd2b3456fe3f8804b730a5ed238fcf1;p=thirdparty%2Fdovecot%2Fcore.git *-login: Change struct login_binary to be non-const Required by the next commit. --- diff --git a/src/imap-login/imap-login-client.c b/src/imap-login/imap-login-client.c index 2c3cd0d50b..0ccb95cdc2 100644 --- a/src/imap-login/imap-login-client.c +++ b/src/imap-login/imap-login-client.c @@ -553,7 +553,7 @@ static struct client_vfuncs imap_client_vfuncs = { .free = client_common_default_free, }; -static const struct login_binary imap_login_binary = { +static struct login_binary imap_login_binary = { .protocol = "imap", .process_name = "imap-login", .default_port = 143, diff --git a/src/imap-urlauth/imap-urlauth-login.c b/src/imap-urlauth/imap-urlauth-login.c index fcde9aaf7a..26ea84954b 100644 --- a/src/imap-urlauth/imap-urlauth-login.c +++ b/src/imap-urlauth/imap-urlauth-login.c @@ -172,7 +172,7 @@ static struct client_vfuncs imap_urlauth_vfuncs = { .free = client_common_default_free, }; -static const struct login_binary imap_urlauth_login_binary = { +static struct login_binary imap_urlauth_login_binary = { .protocol = "imap-urlauth", .process_name = "imap-urlauth-login", .default_login_socket = LOGIN_TOKEN_DEFAULT_SOCKET, diff --git a/src/login-common/login-common.h b/src/login-common/login-common.h index 23935dd43b..2f2628de02 100644 --- a/src/login-common/login-common.h +++ b/src/login-common/login-common.h @@ -44,7 +44,7 @@ struct login_module_register { }; extern struct login_module_register login_module_register; -extern const struct login_binary *login_binary; +extern struct login_binary *login_binary; extern struct auth_client *auth_client; extern struct master_auth *master_auth; extern bool closing_down, login_debug; @@ -71,7 +71,7 @@ void login_client_destroyed(void); /* Call to guarantee that the "anvil" global variable is initialized. */ void login_anvil_init(void); -int login_binary_run(const struct login_binary *binary, +int login_binary_run(struct login_binary *binary, int argc, char *argv[]); #endif diff --git a/src/login-common/main.c b/src/login-common/main.c index 90956b29f7..3a244dfc64 100644 --- a/src/login-common/main.c +++ b/src/login-common/main.c @@ -39,7 +39,7 @@ static struct event_category event_category_auth = { .name = "auth", }; -const struct login_binary *login_binary; +struct login_binary *login_binary; struct auth_client *auth_client; struct master_auth *master_auth; bool closing_down, login_debug; @@ -501,7 +501,7 @@ static void main_deinit(void) event_unref(&event_auth); } -int login_binary_run(const struct login_binary *binary, +int login_binary_run(struct login_binary *binary, int argc, char *argv[]) { enum master_service_flags service_flags = diff --git a/src/pop3-login/client.c b/src/pop3-login/client.c index 3e9cc1bfb8..67c1b54c8f 100644 --- a/src/pop3-login/client.c +++ b/src/pop3-login/client.c @@ -333,7 +333,7 @@ static struct client_vfuncs pop3_client_vfuncs = { .free = client_common_default_free, }; -static const struct login_binary pop3_login_binary = { +static struct login_binary pop3_login_binary = { .protocol = "pop3", .process_name = "pop3-login", .default_port = 110, diff --git a/src/submission-login/client.c b/src/submission-login/client.c index 6921a4386d..20cc5961a2 100644 --- a/src/submission-login/client.c +++ b/src/submission-login/client.c @@ -296,7 +296,7 @@ static struct client_vfuncs submission_client_vfuncs = { .proxy_get_state = submission_proxy_get_state, }; -static const struct login_binary submission_login_binary = { +static struct login_binary submission_login_binary = { .protocol = "submission", .process_name = "submission-login", .default_port = 587,