lmtp: proxy: Add support for making proxy client rawlogs using the lmtp_proxy_rawlog_...

diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index f9257601255462dfe63936f606af51a5791e11ff..920b8308ce3ad58e4f527c9cbc7da3be6d8a8763 100644 (file)
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -119,6 +119,7 @@ lmtp_proxy_init(struct client *client,
        lmtp_set.my_hostname = client->my_domain;
        lmtp_set.dns_client_socket_path = dns_client_socket_path;
        lmtp_set.max_reply_size = LMTP_MAX_REPLY_SIZE;
+       lmtp_set.rawlog_dir = client->lmtp_set->lmtp_proxy_rawlog_dir;
 
        smtp_server_connection_get_proxy_data(client->conn,
                                              &lmtp_set.proxy_data);

diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index f1db0f47e051d34d9a591c5c796c48a2eaaab245..095df3da4bd5f14c587c95b355207107f6f614b9 100644 (file)
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -65,6 +65,7 @@ static const struct setting_define lmtp_setting_defines[] = {
        DEF(SET_UINT, lmtp_user_concurrency_limit),
        DEF(SET_ENUM, lmtp_hdr_delivery_address),
        DEF(SET_STR_VARS, lmtp_rawlog_dir),
+       DEF(SET_STR_VARS, lmtp_proxy_rawlog_dir),
 
        DEF(SET_STR_VARS, login_greeting),
        DEF(SET_STR, login_trusted_networks),
@@ -79,6 +80,7 @@ static const struct lmtp_settings lmtp_default_settings = {
        .lmtp_user_concurrency_limit = 0,
        .lmtp_hdr_delivery_address = "final:none:original",
        .lmtp_rawlog_dir = "",
+       .lmtp_proxy_rawlog_dir = "",
 
        .login_greeting = PACKAGE_NAME" ready.",
        .login_trusted_networks = ""

diff --git a/src/lmtp/lmtp-settings.h b/src/lmtp/lmtp-settings.h
index d4c0b8e2355cc83f0d5aba5d6558ec4e38bac3a6..c470e95d65fce2cddfc44321edc0b6cff3d0e998 100644 (file)
--- a/src/lmtp/lmtp-settings.h
+++ b/src/lmtp/lmtp-settings.h
@@ -19,6 +19,7 @@ struct lmtp_settings {
        unsigned int lmtp_user_concurrency_limit;
        const char *lmtp_hdr_delivery_address;
        const char *lmtp_rawlog_dir;
+       const char *lmtp_proxy_rawlog_dir;
 
        const char *login_greeting;
        const char *login_trusted_networks;