From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 13 Jan 2018 12:34:47 +0000 (+0100)
Subject: lmtp: Add recipient type to struct lmtp_recipient.
X-Git-Tag: 2.3.1~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2374eae04e04a810fc743ac737a4ee8fcbb1a643;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: Add recipient type to struct lmtp_recipient.
---

diff --git a/src/lmtp/lmtp-common.c b/src/lmtp/lmtp-common.c
index e3e34bf5b5..612ec57a62 100644
--- a/src/lmtp/lmtp-common.c
+++ b/src/lmtp/lmtp-common.c
@@ -6,10 +6,12 @@
 
 void lmtp_recipient_init(struct lmtp_recipient *rcpt,
 			 struct client *client,
+			 enum lmtp_recipient_type type,
 			 struct smtp_server_cmd_ctx *cmd,
 			 struct smtp_server_cmd_rcpt *data)
 {
 	rcpt->client = client;
+	rcpt->type = type;
 	rcpt->rcpt_cmd = cmd;
 	rcpt->path = data->path;
 }
diff --git a/src/lmtp/lmtp-common.h b/src/lmtp/lmtp-common.h
index 11db05b5e6..e7e90d757f 100644
--- a/src/lmtp/lmtp-common.h
+++ b/src/lmtp/lmtp-common.h
@@ -7,8 +7,14 @@ struct smtp_server_cmd_rcpt;
 struct smtp_server_recipient;
 struct client;
 
+enum lmtp_recipient_type {
+	LMTP_RECIPIENT_TYPE_LOCAL,
+	LMTP_RECIPIENT_TYPE_PROXY,
+};
+
 struct lmtp_recipient {
 	struct client *client;
+	enum lmtp_recipient_type type;
 
 	struct smtp_address *path;
 	struct smtp_server_cmd_ctx *rcpt_cmd;
@@ -18,6 +24,7 @@ struct lmtp_recipient {
 
 void lmtp_recipient_init(struct lmtp_recipient *rcpt,
 			 struct client *client,
+			 enum lmtp_recipient_type type,
 			 struct smtp_server_cmd_ctx *cmd,
 			 struct smtp_server_cmd_rcpt *data);
 
diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index f4c7de03aa..fae8362998 100644
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -385,7 +385,8 @@ int lmtp_local_rcpt(struct client *client,
 		client->local = lmtp_local_init(client);
 
 	rcpt = i_new(struct lmtp_local_recipient, 1);
-	lmtp_recipient_init(&rcpt->rcpt, client, cmd, data);
+	lmtp_recipient_init(&rcpt->rcpt, client,
+			    LMTP_RECIPIENT_TYPE_LOCAL, cmd, data);
 
 	rcpt->detail = i_strdup(detail);
 	rcpt->service_user = service_user;
diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index 46256a3f22..2d0c774b1e 100644
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -522,7 +522,8 @@ int lmtp_proxy_rcpt(struct client *client,
 	pool_unref(&auth_pool);
 
 	rcpt = i_new(struct lmtp_proxy_recipient, 1);
-	lmtp_recipient_init(&rcpt->rcpt, client, cmd, data);
+	lmtp_recipient_init(&rcpt->rcpt, client,
+			    LMTP_RECIPIENT_TYPE_PROXY, cmd, data);
 
 	rcpt->conn = conn;