From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 29 Aug 2018 20:27:12 +0000 (+0200)
Subject: submission: Split the RCPT command into a generic part and a part related to relaying... 
X-Git-Tag: 2.3.9~1350
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89e1b7cdbfa619b3c29164c79bad1435e6f88186;p=thirdparty%2Fdovecot%2Fcore.git

submission: Split the RCPT command into a generic part and a part related to relaying to an MTA.
---

diff --git a/src/submission/cmd-rcpt.c b/src/submission/cmd-rcpt.c
index 1d5d379d14..2734a10d9b 100644
--- a/src/submission/cmd-rcpt.c
+++ b/src/submission/cmd-rcpt.c
@@ -55,10 +55,9 @@ static void cmd_rcpt_proxy_cb(const struct smtp_reply *proxy_reply,
 	smtp_server_reply_forward(cmd, &reply);
 }
 
-int cmd_rcpt(void *conn_ctx, struct smtp_server_cmd_ctx *cmd,
-	     struct smtp_server_cmd_rcpt *data)
+int cmd_rcpt_relay(struct client *client, struct smtp_server_cmd_ctx *cmd,
+		   struct smtp_server_cmd_rcpt *data)
 {
-	struct client *client = conn_ctx;
 	struct cmd_rcpt_context *rcpt_cmd;
 
 	/* queue command (pipeline) */
@@ -75,3 +74,11 @@ int cmd_rcpt(void *conn_ctx, struct smtp_server_cmd_ctx *cmd,
 		cmd_rcpt_proxy_cb, rcpt_cmd);
 	return 0;
 }
+
+int cmd_rcpt(void *conn_ctx, struct smtp_server_cmd_ctx *cmd,
+	     struct smtp_server_cmd_rcpt *data)
+{
+	struct client *client = conn_ctx;
+
+	return cmd_rcpt_relay(client, cmd, data);
+}
diff --git a/src/submission/submission-commands.h b/src/submission/submission-commands.h
index 7babc370f6..788f7ad73b 100644
--- a/src/submission/submission-commands.h
+++ b/src/submission/submission-commands.h
@@ -8,6 +8,8 @@ int cmd_helo_relay(struct client *client, struct smtp_server_cmd_ctx *cmd,
 		   struct smtp_server_cmd_helo *data);
 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);
 
 void submission_helo_reply_submit(struct smtp_server_cmd_ctx *cmd,
 				  struct smtp_server_cmd_helo *data);