lib-smtp: client: Make smtp_client_connection_send_xclient() return void.

diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c
index c792fc0c55ce8ae0345a9644fea69a63ef1bf281..6b239b3a223d480c5e503aa8c40ffb8940673a97 100644 (file)
--- a/src/lib-smtp/smtp-client-connection.c
+++ b/src/lib-smtp/smtp-client-connection.c
@@ -721,7 +721,7 @@ smtp_client_connection_xclient_addf(struct smtp_client_connection *conn,
        va_end(args);
 }
 
-bool smtp_client_connection_send_xclient(struct smtp_client_connection *conn,
+void smtp_client_connection_send_xclient(struct smtp_client_connection *conn,
                                         struct smtp_proxy_data *xclient)
 {
        const char **xclient_args = conn->caps.xclient_args;
@@ -729,10 +729,10 @@ bool smtp_client_connection_send_xclient(struct smtp_client_connection *conn,
        string_t *str;
 
        if (!conn->set.peer_trusted)
-               return TRUE;
+               return;
        if ((conn->caps.standard & SMTP_CAPABILITY_XCLIENT) == 0 ||
            conn->caps.xclient_args == NULL)
-               return TRUE;
+               return;
 
        i_assert(conn->xclient_replies_expected == 0);
 
@@ -828,8 +828,6 @@ bool smtp_client_connection_send_xclient(struct smtp_client_connection *conn,
        /* final XCLIENT command */
        if (str_len(str) > offset)
                smtp_client_connection_xclient_submit(conn, str_c(str));
-
-       return (conn->xclient_replies_expected == 0);
 }
 
 static bool
@@ -837,8 +835,8 @@ smtp_client_connection_init_xclient(struct smtp_client_connection *conn)
 {
        if (!conn->initial_xclient_sent) {
                conn->initial_xclient_sent = TRUE;
-               if (!smtp_client_connection_send_xclient(conn,
-                                                        &conn->set.proxy_data))
+               smtp_client_connection_send_xclient(conn, &conn->set.proxy_data);
+               if (conn->xclient_replies_expected > 0)
                        return FALSE;
        }
 

diff --git a/src/lib-smtp/smtp-client-connection.h b/src/lib-smtp/smtp-client-connection.h
index dc0d8861380740d11611fa139d0fc4c866730c62..3e94f80d4e2a485d4180f16b7a54c674db24f9e4 100644 (file)
--- a/src/lib-smtp/smtp-client-connection.h
+++ b/src/lib-smtp/smtp-client-connection.h
@@ -64,7 +64,7 @@ void smtp_client_connection_uncork(struct smtp_client_connection *conn);
 void smtp_client_connection_connect(struct smtp_client_connection *conn,
        smtp_client_command_callback_t login_callback, void *login_context);
 void smtp_client_connection_disconnect(struct smtp_client_connection *conn);
-bool smtp_client_connection_send_xclient(struct smtp_client_connection *conn,
+void smtp_client_connection_send_xclient(struct smtp_client_connection *conn,
                                         struct smtp_proxy_data *xclient);
 
 void smtp_client_connection_switch_ioloop(struct smtp_client_connection *conn);

diff --git a/src/submission/submission-backend-relay.c b/src/submission/submission-backend-relay.c
index 2e54d53d38f878da01f96f795cd7454eda259809..4bd423c4474c44a57b193e855ba99a0d5dc2a2fb 100644 (file)
--- a/src/submission/submission-backend-relay.c
+++ b/src/submission/submission-backend-relay.c
@@ -242,7 +242,7 @@ relay_cmd_helo_update_xclient(struct submission_backend_relay *backend,
        proxy_data.proto = (data->helo.old_smtp ?
                SMTP_PROXY_PROTOCOL_SMTP : SMTP_PROXY_PROTOCOL_ESMTP);
 
-       (void)smtp_client_connection_send_xclient(backend->conn, &proxy_data);
+       smtp_client_connection_send_xclient(backend->conn, &proxy_data);
        backend->xclient_sent = TRUE;
 }
 
@@ -354,7 +354,7 @@ relay_cmd_mail_update_xclient(struct submission_backend_relay *backend)
        proxy_data.helo = helo_data->domain;
        proxy_data.proto = SMTP_PROXY_PROTOCOL_ESMTP;
 
-       (void)smtp_client_connection_send_xclient(backend->conn, &proxy_data);
+       smtp_client_connection_send_xclient(backend->conn, &proxy_data);
        backend->xclient_sent = TRUE;
 }