submission: Split the RSET command into a generic part and a part related to relaying...

diff --git a/src/submission/cmd-rset.c b/src/submission/cmd-rset.c
index a9ebcde5f53c9069173bb6bd1b8c1408b3e3758f..5d3971e22994b9b1300041ec7a9a9db98732df8c 100644 (file)
--- a/src/submission/cmd-rset.c
+++ b/src/submission/cmd-rset.c
@@ -35,9 +35,8 @@ static void cmd_rset_proxy_cb(const struct smtp_reply *proxy_reply,
        smtp_server_reply_forward(cmd, &reply);
 }
 
-int cmd_rset(void *conn_ctx, struct smtp_server_cmd_ctx *cmd)
+int cmd_rset_relay(struct client *client, struct smtp_server_cmd_ctx *cmd)
 {
-       struct client *client = conn_ctx;
        struct cmd_rset_context *rset_cmd;
 
        rset_cmd = p_new(cmd->pool, struct cmd_rset_context, 1);
@@ -48,3 +47,10 @@ int cmd_rset(void *conn_ctx, struct smtp_server_cmd_ctx *cmd)
                (client->proxy_conn, 0, cmd_rset_proxy_cb, rset_cmd);
        return 0;
 }
+
+int cmd_rset(void *conn_ctx, struct smtp_server_cmd_ctx *cmd)
+{
+       struct client *client = conn_ctx;
+
+       return cmd_rset_relay(client, cmd);
+}

diff --git a/src/submission/submission-commands.h b/src/submission/submission-commands.h
index 788f7ad73b288527a6dd9dbd82cb5bc9bfe9539b..dadb923eeb29307a9ced1d917b714ec31b8a61db 100644 (file)
--- a/src/submission/submission-commands.h
+++ b/src/submission/submission-commands.h
@@ -10,6 +10,7 @@ int cmd_mail_relay(struct client *client, struct smtp_server_cmd_ctx *cmd,
                   struct smtp_server_cmd_mail *data);
 int cmd_rcpt_relay(struct client *client, struct smtp_server_cmd_ctx *cmd,
                   struct smtp_server_cmd_rcpt *data);
+int cmd_rset_relay(struct client *client, struct smtp_server_cmd_ctx *cmd);
 
 void submission_helo_reply_submit(struct smtp_server_cmd_ctx *cmd,
                                  struct smtp_server_cmd_helo *data);