From: Martti Rannanjärvi <martti.rannanjarvi@open-xchange.com>
Date: Mon, 20 Apr 2020 10:46:38 +0000 (+0300)
Subject: lib-smtp: Add allow_root flag to smtp_submit_input and smtp_submit_session
X-Git-Tag: 2.3.11.2~231
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0475e7a13852e574f6bc9033145df264c50d288;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: Add allow_root flag to smtp_submit_input and smtp_submit_session

This is to make it possible to run make check on Debian fakeroot later.
---

diff --git a/src/lib-smtp/smtp-submit.c b/src/lib-smtp/smtp-submit.c
index 1e853ec896..e8a1577fd3 100644
--- a/src/lib-smtp/smtp-submit.c
+++ b/src/lib-smtp/smtp-submit.c
@@ -31,6 +31,7 @@ struct smtp_submit_session {
 	struct smtp_submit_settings set;
 	struct ssl_iostream_settings ssl_set;
 	struct event *event;
+	bool allow_root:1;
 };
 
 struct smtp_submit {
@@ -84,6 +85,7 @@ smtp_submit_session_init(const struct smtp_submit_input *input,
 		ssl_iostream_settings_init_from(pool, &session->ssl_set,
 						input->ssl);
 	}
+	session->allow_root = input->allow_root;
 
 	session->event = event_create(input->event_parent);
 	event_add_category(session->event, &event_category_smtp_submit);
@@ -416,6 +418,7 @@ smtp_submit_send_sendmail(struct smtp_submit *subm)
 	pc_set.input_idle_timeout_msecs = set->submission_timeout * 1000;
 	pc_set.debug = set->mail_debug;
 	pc_set.event = subm->event;
+	pc_set.allow_root = subm->session->allow_root;
 	restrict_access_init(&pc_set.restrict_set);
 
 	pc = program_client_local_create
diff --git a/src/lib-smtp/smtp-submit.h b/src/lib-smtp/smtp-submit.h
index f52dc4f92d..6a00f56f10 100644
--- a/src/lib-smtp/smtp-submit.h
+++ b/src/lib-smtp/smtp-submit.h
@@ -15,6 +15,9 @@ struct smtp_submit_input {
 
 	/* Event to use as parent for the submit event */
 	struct event *event_parent;
+
+	/* Allow running sendmail as root */
+	bool allow_root:1;
 };
 
 struct smtp_submit_result {