lib-smtp: Remove smtp_submit_session.allow_root

If sendmail is executed, it will be as whatever the current process is
running as. Outside unit tests this isn't expected to be root, but if it
is, there's nothing to be gained by preventing it.

diff --git a/src/lib-smtp/smtp-submit.c b/src/lib-smtp/smtp-submit.c
index 5b58c7da588816975bb5f4351fce7d30ae757a61..5bc0513dd00a4768af43d4056e29c76d878e5b86 100644 (file)
--- a/src/lib-smtp/smtp-submit.c
+++ b/src/lib-smtp/smtp-submit.c
@@ -31,7 +31,6 @@ struct smtp_submit_session {
        pool_t pool;
        struct smtp_submit_settings set;
        struct event *event;
-       bool allow_root:1;
 };
 
 struct smtp_submit {
@@ -81,8 +80,6 @@ smtp_submit_session_init(const struct smtp_submit_input *input,
        session->set.submission_ssl =
                p_strdup_empty(pool, set->submission_ssl);
 
-       session->allow_root = input->allow_root;
-
        session->event = event_create(input->event_parent);
        event_set_forced_debug(session->event, set->mail_debug);
        event_add_category(session->event, &event_category_smtp_submit);
@@ -415,7 +412,7 @@ smtp_submit_send_sendmail(struct smtp_submit *subm)
        pc_params.input_idle_timeout_msecs = set->submission_timeout * 1000;
        pc_params.event = subm->event;
 
-       pc_params.allow_root = subm->session->allow_root;
+       pc_params.allow_root = TRUE;
        restrict_access_init(&pc_params.restrict_set);
 
        pc = program_client_local_create

diff --git a/src/lib-smtp/smtp-submit.h b/src/lib-smtp/smtp-submit.h
index bf62a7be12bc24a443a90c44c338f3dfc3c4e1fb..bf54b84f5af9bac875811276617431e66e19dcf4 100644 (file)
--- a/src/lib-smtp/smtp-submit.h
+++ b/src/lib-smtp/smtp-submit.h
@@ -12,9 +12,6 @@ struct smtp_submit;
 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 {

diff --git a/src/lib-smtp/test-smtp-submit.c b/src/lib-smtp/test-smtp-submit.c
index 935f1e0c469fbc22ab2bebf8823f778d8153357f..f0fba4b852c49273ff6cfd54c1bc2cf34af823aa 100644 (file)
--- a/src/lib-smtp/test-smtp-submit.c
+++ b/src/lib-smtp/test-smtp-submit.c
@@ -733,7 +733,6 @@ static void test_server_denied_second_rcpt(unsigned int index)
 static void test_smtp_submit_input_init(struct smtp_submit_input *smtp_input_r)
 {
        i_zero(smtp_input_r);
-       smtp_input_r->allow_root = TRUE;
 }
 
 static bool