submission: Split the RCPT command into a generic part and a part rel…

…ated to relaying to an MTA.
dovecot · Feb 12, 2019 · 20f1717 · 20f1717
1 parent 62edb8e
commit 20f1717
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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);