exchange.m4, config.m4: Arrange to listen on the submission port.

[exim-config] / base.m4

diff --git a/base.m4 b/base.m4
index fee362633d4f8348a5b5de62b91f716a6642739c..9d0808803698b552c5be892ae3731f4b3368849d 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -25,6 +25,7 @@
 ### Global settings.
 
 SECTION(global, priv)m4_dnl
+admin_groups = root : adm
 prod_requires_admin = false
 
 SECTION(global, logging)m4_dnl
@@ -64,10 +65,11 @@ received_header_text = Received: \
              ${if def:sender_helo_name \
                   {(helo=$sender_helo_name)\n\t}}}}\
        by $primary_hostname \
+       (Exim $version_number)\
+       ${if def:tls_cipher {\n\t} { }}\
        ${if def:received_protocol \
             {with $received_protocol \
-             ${if def:tls_cipher {(cipher=$tls_cipher)\n\t}}}}\
-       (Exim $version_number)\n\t\
+             ${if def:tls_cipher {(cipher=$tls_cipher)}}}}\n\t\
        ${if def:sender_address \
             {(envelope-from <$sender_address>\
              ${if def:authenticated_id \
@@ -258,21 +260,32 @@ smtp_local:
 deliver:
        driver = appendfile
        file = /var/mail/$local_part
+       group = mail
+       mode = 0600
+       mode_fail_narrower = false
        USER_DELIVERY
 
 ## Transports for user filters.
 mailbox:
        driver = appendfile
+       initgroups = true
        USER_DELIVERY
 
 maildir:
        driver = appendfile
        maildir_format = true
+       initgroups = true
        USER_DELIVERY
 
 pipe:
        driver = pipe
-       return_output = true
+       path = ${if and {{def:home} {exists{$home/bin}}} {$home/bin:} {}}\
+               /usr/local/bin:/usr/local/sbin:\
+               /usr/bin:/usr/sbin:/bin:/sbin
+       initgroups = true
+       umask = 002
+       return_fail_output = true
+       log_output = true
 
 ## A special dummy transport for use during address verification.
 dummy: