From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 12 May 2018 10:27:37 +0000 (+0200)
Subject: lmtp: proxy: Add support for making proxy client rawlogs using the lmtp_proxy_rawlog_... 
X-Git-Tag: 2.3.2.rc1~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49d5b83a1df38c917ef6910a110d1658272e8ba2;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: proxy: Add support for making proxy client rawlogs using the lmtp_proxy_rawlog_dir setting.
---

diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index f925760125..920b8308ce 100644
--- 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 f1db0f47e0..095df3da4b 100644
--- 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 d4c0b8e235..c470e95d65 100644
--- 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;