lmtp: Add recipient type to struct lmtp_recipient.

diff --git a/src/lmtp/lmtp-common.c b/src/lmtp/lmtp-common.c
index e3e34bf5b53e7d182a541c1a0ed235c021025e2b..612ec57a628d91be06bb8f727a2d096fdc26995c 100644 (file)
--- 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 11db05b5e646a7e2af4570088f235ed8ad871b25..e7e90d757f92e9d6a802bd2d336d926f0cc212fe 100644 (file)
--- 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 f4c7de03aac2a76e35af7c26b649362da7f42b2a..fae8362998e6dec0931ee02a1f3ca39a9e69914b 100644 (file)
--- 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 46256a3f223981257e9d8e814a44c8ca61c8d008..2d0c774b1e83166091fd676479e912bc0cb3b3ef 100644 (file)
--- 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;