*-commin: Rename LOGIN_PROXY_FAILURE_TYPE_AUTH to LOGIN_PROXY_FAILURE_TYPE_AUTH_REPLIED

diff --git a/src/imap-login/imap-proxy.c b/src/imap-login/imap-proxy.c
index b58bf1b9ad5b89c36aac36eaf51a9f65b82ff0c8..75af0134ab0b9d476945cd65bb7eccdb127118fd 100644 (file)
--- a/src/imap-login/imap-proxy.c
+++ b/src/imap-login/imap-proxy.c
@@ -428,7 +428,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"
@@ -587,7 +587,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 2ad85aba7191c99751ac539462888e11862abe28..3043e1448219098edd12a2ef2d5b022e7cf35cae 100644 (file)
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -425,7 +425,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 3fd8aec7e3445d9638301bbfe16afa4ec819e7ad..cf26ff2aecb45b4e497c26b649058209b2781748 100644 (file)
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -1446,7 +1446,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 121748f183a5bcc0b394921e583d298e46e50754..492ebbce802d1dd189e50356863d65a8cea37df2 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 07e0e7e39a71c0f7d5ab0c053db0d5d0ada8ad70..486dde87e2e3ccc61646bc0161d47b365bb8e1b3 100644 (file)
--- a/src/pop3-login/pop3-proxy.c
+++ b/src/pop3-login/pop3-proxy.c
@@ -321,7 +321,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);
@@ -372,7 +372,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 5f711f4a3a51e4ca7e68b1e475391b44b077c444..2820f7c76b7af36231cc35a8208c759926fa8912 100644 (file)
--- a/src/submission-login/submission-proxy.c
+++ b/src/submission-login/submission-proxy.c
@@ -694,7 +694,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(
@@ -750,7 +750,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;