From ca7e02367ba29cb057accc35d6d4ae2d3a8583da Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Sat, 12 May 2018 12:20:08 +0200 Subject: [PATCH] submission: Add support for making server rawlogs using the rawlog_dir setting. Similar services like pop3 and imap already support this setting, but for submission this was omitted. --- src/submission/submission-client.c | 1 + src/submission/submission-settings.c | 2 ++ src/submission/submission-settings.h | 1 + 3 files changed, 4 insertions(+) diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c index be5156e2c1..d79237d3e4 100644 --- a/src/submission/submission-client.c +++ b/src/submission/submission-client.c @@ -208,6 +208,7 @@ struct client *client_create(int fd_in, int fd_out, smtp_set.max_recipients = set->submission_max_recipients; smtp_set.max_client_idle_time_msecs = CLIENT_IDLE_TIMEOUT_MSECS; smtp_set.max_message_size = set->submission_max_mail_size; + smtp_set.rawlog_dir = set->rawlog_dir; smtp_set.debug = user->mail_debug; if ((workarounds & WORKAROUND_WHITESPACE_BEFORE_PATH) != 0) { diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c index 35a82d04a5..a2bf057ba6 100644 --- a/src/submission/submission-settings.c +++ b/src/submission/submission-settings.c @@ -58,6 +58,7 @@ struct service_settings submission_service_settings = { static const struct setting_define submission_setting_defines[] = { DEF(SET_BOOL, verbose_proctitle), + DEF(SET_STR_VARS, rawlog_dir), DEF(SET_STR, hostname), @@ -94,6 +95,7 @@ static const struct setting_define submission_setting_defines[] = { static const struct submission_settings submission_default_settings = { .verbose_proctitle = FALSE, + .rawlog_dir = "", .hostname = "", diff --git a/src/submission/submission-settings.h b/src/submission/submission-settings.h index dee42607e6..c033c7dc8c 100644 --- a/src/submission/submission-settings.h +++ b/src/submission/submission-settings.h @@ -12,6 +12,7 @@ enum submission_client_workarounds { struct submission_settings { bool verbose_proctitle; + const char *rawlog_dir; const char *hostname; -- 2.47.3