lmtp: Renamed struct mail_recipient to struct lmtp_recipient.

diff --git a/src/lmtp/client.c b/src/lmtp/client.c
index ebaf55152baf06c2be2df11b159792f28e728e4c..f36f1abfa9703201e1efdcdc5712235e5484a0ca 100644 (file)
--- a/src/lmtp/client.c
+++ b/src/lmtp/client.c
@@ -187,7 +187,7 @@ struct client *client_create(int fd_in, int fd_out,
 
 void client_state_reset(struct client *client, const char *state_name)
 {
-       struct mail_recipient *const *rcptp;
+       struct lmtp_recipient *const *rcptp;
 
        if (client->proxy != NULL)
                lmtp_proxy_deinit(&client->proxy);

diff --git a/src/lmtp/client.h b/src/lmtp/client.h
index 2cfcff8b6580a58212d647bbb91ec4bbc91e89f0..37eb5ff35f06d0e07f60f0e6dc5d68174d0a1f48 100644 (file)
--- a/src/lmtp/client.h
+++ b/src/lmtp/client.h
@@ -6,7 +6,7 @@
 
 #define CLIENT_MAIL_DATA_MAX_INMEMORY_SIZE (1024*128)
 
-struct mail_recipient {
+struct lmtp_recipient {
        struct client *client;
        const char *session_id;
 
@@ -24,7 +24,7 @@ struct client_state {
        const char *session_id;
        struct smtp_address *mail_from;
        struct smtp_params_mail mail_params;
-       ARRAY(struct mail_recipient *) rcpt_to;
+       ARRAY(struct lmtp_recipient *) rcpt_to;
        unsigned int rcpt_idx;
 
        unsigned int data_end_idx;

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index 6e1fd9479bf9155739bf3b7377103a37177ca99b..b506a1a445c618c5e7f95aa3253336a47420ff61 100644 (file)
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -185,7 +185,7 @@ int cmd_mail(struct client *client, const char *args)
 
 int cmd_rcpt(struct client *client, const char *args)
 {
-       struct mail_recipient *rcpt;
+       struct lmtp_recipient *rcpt;
        struct mail_storage_service_input input;
        struct smtp_address *address;
        const char *username, *detail;
@@ -217,7 +217,7 @@ int cmd_rcpt(struct client *client, const char *args)
                return 0;
        }
 
-       rcpt = p_new(client->state_pool, struct mail_recipient, 1);
+       rcpt = p_new(client->state_pool, struct lmtp_recipient, 1);
        rcpt->client = client;
 
        /* [SP Rcpt-parameters] */
@@ -420,7 +420,7 @@ static const char *client_get_added_headers(struct client *client)
        const char *host;
 
        if (array_count(&client->state.rcpt_to) == 1) {
-               struct mail_recipient *const *rcptp =
+               struct lmtp_recipient *const *rcptp =
                        array_idx(&client->state.rcpt_to, 0);
 
                sets = mail_storage_service_user_get_set((*rcptp)->service_user);

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 6e5b9bb4d2c7a8492e4961ae1a6a918ea9dac942..f030c1f0b8c5ce02d4e01858e2e1e7779652ddca 100644 (file)
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -35,7 +35,7 @@
  * Recipient
  */
 
-void client_rcpt_anvil_disconnect(const struct mail_recipient *rcpt)
+void client_rcpt_anvil_disconnect(const struct lmtp_recipient *rcpt)
 {
        const struct mail_storage_service_input *input;
 
@@ -50,7 +50,7 @@ void client_rcpt_anvil_disconnect(const struct mail_recipient *rcpt)
 
 static void
 client_send_line_overquota(struct client *client,
-                          const struct mail_recipient *rcpt, const char *error)
+                          const struct lmtp_recipient *rcpt, const char *error)
 {
        struct lda_settings *lda_set =
                mail_storage_service_user_get_set(rcpt->service_user)[2];
@@ -63,7 +63,7 @@ client_send_line_overquota(struct client *client,
 static void
 client_rcpt_fail_all(struct client *client)
 {
-       struct mail_recipient *const *rcptp;
+       struct lmtp_recipient *const *rcptp;
 
        array_foreach(&client->state.rcpt_to, rcptp) {
                client_send_line(client, ERRSTR_TEMP_MAILBOX_FAIL,
@@ -77,7 +77,7 @@ client_rcpt_fail_all(struct client *client)
 
 static int
 lmtp_rcpt_to_is_over_quota(struct client *client,
-                          const struct mail_recipient *rcpt)
+                          const struct lmtp_recipient *rcpt)
 {
        struct mail_user *user;
        struct mail_namespace *ns;
@@ -129,7 +129,7 @@ lmtp_rcpt_to_is_over_quota(struct client *client,
        return ret;
 }
 
-bool cmd_rcpt_finish(struct client *client, struct mail_recipient *rcpt)
+bool cmd_rcpt_finish(struct client *client, struct lmtp_recipient *rcpt)
 {
        int ret;
 
@@ -148,7 +148,7 @@ bool cmd_rcpt_finish(struct client *client, struct mail_recipient *rcpt)
 
 void rcpt_anvil_lookup_callback(const char *reply, void *context)
 {
-       struct mail_recipient *rcpt = context;
+       struct lmtp_recipient *rcpt = context;
        struct client *client = rcpt->client;
        const struct mail_storage_service_input *input;
        unsigned int parallel_count = 0;
@@ -182,7 +182,7 @@ void rcpt_anvil_lookup_callback(const char *reply, void *context)
  */
 
 static int
-client_deliver(struct client *client, const struct mail_recipient *rcpt,
+client_deliver(struct client *client, const struct lmtp_recipient *rcpt,
               struct mail *src_mail, struct mail_deliver_session *session)
 {
        struct mail_deliver_context dctx;
@@ -354,7 +354,7 @@ static uid_t client_deliver_to_rcpts(struct client *client,
        uid_t first_uid = (uid_t)-1;
        struct mail *src_mail;
 
-       struct mail_recipient *const *rcpts;
+       struct lmtp_recipient *const *rcpts;
        unsigned int count;
        int ret;
        src_mail = client->state.raw_mail;

diff --git a/src/lmtp/lmtp-local.h b/src/lmtp/lmtp-local.h
index 1f9b7efd7eb5db04413867c6b2ca5bba14ea871a..2633194ad7f03e3da4fb299aaabd0c742e15f162 100644 (file)
--- a/src/lmtp/lmtp-local.h
+++ b/src/lmtp/lmtp-local.h
@@ -2,12 +2,12 @@
 #define LMTP_LOCAL_H
 
 struct client;
-struct mail_recipient;
+struct lmtp_recipient;
 struct mail_deliver_session;
 
-void client_rcpt_anvil_disconnect(const struct mail_recipient *rcpt);
+void client_rcpt_anvil_disconnect(const struct lmtp_recipient *rcpt);
 
-bool cmd_rcpt_finish(struct client *client, struct mail_recipient *rcpt);
+bool cmd_rcpt_finish(struct client *client, struct lmtp_recipient *rcpt);
 
 void rcpt_anvil_lookup_callback(const char *reply, void *context);