[PATCH] *-commin: Rename LOGIN_PROXY_FAILURE_TYPE_AUTH to LOGIN_PROXY_FAILURE_TYPE_AU...

Gbp-Pq: Name 0001-commin-Rename-LOGIN_PROXY_FAILURE_TYPE_AUTH-to-LOGIN.patch

diff --git a/src/imap-login/imap-proxy.c b/src/imap-login/imap-proxy.c
index d76a728721e7efa2e42ab97c3cb6b6418de5e9ce..6f81dc8b67eeaa097949f863dcc58a1a2990e0ac 100644 (file)
--- a/src/imap-login/imap-proxy.c
+++ b/src/imap-login/imap-proxy.c
@@ -427,7 +427,7 @@ int imap_proxy_parse_line(struct client *client, const char *line)
                const char *log_line = line;
                (void)str_begins_icase(log_line, "NO ", &log_line);
                enum login_proxy_failure_type failure_type =
-                       LOGIN_PROXY_FAILURE_TYPE_AUTH;
+                       LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED;
 #define STR_NO_IMAP_RESP_CODE_AUTHFAILED "NO ["IMAP_RESP_CODE_AUTHFAILED"]"
                if (str_begins_with(line, STR_NO_IMAP_RESP_CODE_AUTHFAILED)) {
                        /* the remote sent a generic "authentication failed"
@@ -586,7 +586,7 @@ imap_proxy_send_failure_reply(struct imap_client *imap_client,
                client_send_raw(&imap_client->common, t_strconcat(
                        imap_client->cmd_tag, " NO ", reason, "\r\n", NULL));
                break;
-       case LOGIN_PROXY_FAILURE_TYPE_AUTH:
+       case LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED:
                /* reply was already sent */
                break;
        }

diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index 1858edf92be1fe876519d521a63794f08058283a..0b226497c60a1fd92e29676ac43c9e4be0324de9 100644 (file)
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -426,7 +426,7 @@ proxy_redirect_reauth_callback(struct auth_client_request *request,
                        /* Disconnect from the original backend */
                        login_proxy_failed(client->login_proxy,
                                login_proxy_get_event(client->login_proxy),
-                               LOGIN_PROXY_FAILURE_TYPE_AUTH,
+                               LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED,
                                t_strdup_printf("Redirected to %s", reply.proxy.host));
                        return;
                }

diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index af63133c663096738352c8d8ce04f03b1c6de241..cefe157bd99cfbe73d6bda4a73669369947d5368 100644 (file)
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -1385,7 +1385,7 @@ bool client_get_extra_disconnect_reason(struct client *client,
                        event_reason = "protocol_failure";
                        last_reason = "protocol failure";
                        break;
-               case LOGIN_PROXY_FAILURE_TYPE_AUTH:
+               case LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED:
                        event_reason = "auth_failed";
                        last_reason = "authentication failure";
                        break;

diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c
index 5743ea83644072d44859090e9a2ef1d5826e504f..cba9d9d8cd1d5fdd9d8029348789f4119c86143e 100644 (file)
--- a/src/login-common/login-proxy.c
+++ b/src/login-common/login-proxy.c
@@ -829,7 +829,7 @@ bool login_proxy_failed(struct login_proxy *proxy, struct event *event,
        case LOGIN_PROXY_FAILURE_TYPE_PROTOCOL:
                log_prefix = "Remote server sent invalid input: ";
                break;
-       case LOGIN_PROXY_FAILURE_TYPE_AUTH:
+       case LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED:
                log_prefix = "";
                try_reconnect = FALSE;
                break;
@@ -854,7 +854,7 @@ bool login_proxy_failed(struct login_proxy *proxy, struct event *event,
                return TRUE;
        }
 
-       if (type != LOGIN_PROXY_FAILURE_TYPE_AUTH &&
+       if (type != LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED &&
            type != LOGIN_PROXY_FAILURE_TYPE_AUTH_TEMPFAIL)
                e_error(event, "%s%s", log_prefix, reason);
        else if (proxy->client->set->auth_verbose)

diff --git a/src/login-common/login-proxy.h b/src/login-common/login-proxy.h
index 23fc724810b4e1ac7310a77ee89332329c3ab786..6465cfc6eb1defba79275c160f1f50193ab3753a 100644 (file)
--- a/src/login-common/login-proxy.h
+++ b/src/login-common/login-proxy.h
@@ -34,7 +34,7 @@ enum login_proxy_failure_type {
        LOGIN_PROXY_FAILURE_TYPE_PROTOCOL,
        /* Authentication failed to backend. The LOGIN/AUTH command reply was
           already sent to the client. */
-       LOGIN_PROXY_FAILURE_TYPE_AUTH,
+       LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED,
        /* Authentication failed with a temporary failure code. Attempting it
           again might work. */
        LOGIN_PROXY_FAILURE_TYPE_AUTH_TEMPFAIL,

diff --git a/src/pop3-login/pop3-proxy.c b/src/pop3-login/pop3-proxy.c
index befd897d6bf4b9e5714147bd332128d27e9cb631..1f2934c4b8637a970d191f9c39fa891b93da967b 100644 (file)
--- a/src/pop3-login/pop3-proxy.c
+++ b/src/pop3-login/pop3-proxy.c
@@ -322,7 +322,7 @@ int pop3_proxy_parse_line(struct client *client, const char *line)
           shouldn't be a real problem since of course everyone will
           be using only Dovecot as their backend :) */
        enum login_proxy_failure_type failure_type =
-               LOGIN_PROXY_FAILURE_TYPE_AUTH;
+               LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED;
        if (!str_begins_with(line, "-ERR ")) {
                client_send_reply(client, POP3_CMD_REPLY_ERROR,
                                  AUTH_FAILED_MSG);
@@ -373,7 +373,7 @@ pop3_proxy_send_failure_reply(struct client *client,
                /* [SYS/TEMP] prefix is already in the reason string */
                client_send_reply(client, POP3_CMD_REPLY_ERROR, reason);
                break;
-       case LOGIN_PROXY_FAILURE_TYPE_AUTH:
+       case LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED:
                /* reply was already sent */
                break;
        }

diff --git a/src/submission-login/submission-proxy.c b/src/submission-login/submission-proxy.c
index 7fc77bfc8081de6afe5569ebb03f33a228e142e5..ef1a25c264764471cc1aa8c89151eb412cb9291e 100644 (file)
--- a/src/submission-login/submission-proxy.c
+++ b/src/submission-login/submission-proxy.c
@@ -693,7 +693,7 @@ int submission_proxy_parse_line(struct client *client, const char *line)
           shouldn't be a real problem since of course everyone will
           be using only Dovecot as their backend :) */
        enum login_proxy_failure_type failure_type =
-               LOGIN_PROXY_FAILURE_TYPE_AUTH;
+               LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED;
        if ((status / 100) == 4)
                failure_type = LOGIN_PROXY_FAILURE_TYPE_AUTH_TEMPFAIL;
        else if (!submission_proxy_handle_redirect(
@@ -749,7 +749,7 @@ submission_proxy_send_failure_reply(struct submission_client *subm_client,
                i_assert(subm_client->proxy_reply != NULL);
                smtp_server_reply_submit(subm_client->proxy_reply);
                break;
-       case LOGIN_PROXY_FAILURE_TYPE_AUTH:
+       case LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED:
                /* reply was already sent */
                i_assert(cmd == NULL);
                break;