From 915792e6df5054895ca3d5557c9bd13aee1efe27 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Sat, 12 May 2018 12:18:27 +0200 Subject: [PATCH] lmtp: Add support for making server rawlogs using the lmtp_rawlog_dir setting. --- src/lmtp/client.c | 1 + src/lmtp/lmtp-settings.c | 4 ++++ src/lmtp/lmtp-settings.h | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/lmtp/client.c b/src/lmtp/client.c index 9f50d11399..c4075f6f47 100644 --- a/src/lmtp/client.c +++ b/src/lmtp/client.c @@ -158,6 +158,7 @@ struct client *client_create(int fd_in, int fd_out, lmtp_set.hostname = client->unexpanded_lda_set->hostname; lmtp_set.rcpt_domain_optional = TRUE; lmtp_set.max_client_idle_time_msecs = CLIENT_IDLE_TIMEOUT_MSECS; + lmtp_set.rawlog_dir = client->lmtp_set->lmtp_rawlog_dir; client->conn = smtp_server_connection_create (lmtp_server, fd_in, fd_out, diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c index eff29ae65f..f1db0f47e0 100644 --- a/src/lmtp/lmtp-settings.c +++ b/src/lmtp/lmtp-settings.c @@ -64,6 +64,8 @@ static const struct setting_define lmtp_setting_defines[] = { DEF(SET_BOOL, lmtp_rcpt_check_quota), 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, login_greeting), DEF(SET_STR, login_trusted_networks), @@ -76,6 +78,8 @@ static const struct lmtp_settings lmtp_default_settings = { .lmtp_rcpt_check_quota = FALSE, .lmtp_user_concurrency_limit = 0, .lmtp_hdr_delivery_address = "final:none:original", + .lmtp_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 18b116829a..d4c0b8e235 100644 --- a/src/lmtp/lmtp-settings.h +++ b/src/lmtp/lmtp-settings.h @@ -18,6 +18,8 @@ struct lmtp_settings { bool lmtp_rcpt_check_quota; unsigned int lmtp_user_concurrency_limit; const char *lmtp_hdr_delivery_address; + const char *lmtp_rawlog_dir; + const char *login_greeting; const char *login_trusted_networks;