X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/b6d742526e8fcf69f22589314ee8f12b7756f026..3865ac978227c61adf9ad09146f23c3a61f9b1be:/config.m4

diff --git a/config.m4 b/config.m4
index d84f648..d64ba68 100644
--- a/config.m4
+++ b/config.m4
@@ -30,6 +30,10 @@ DEFCONF(smarthost, mail.distorted.org.uk)
 ## The user who runs verification filters.
 DEFCONF(filter_user, Debian-exim)
 
+## Administrative groups.
+DEFCONF(admin_groups, root : adm)
+DEFCONF(trusted_groups, root : adm)
+
 ## Where the spam filter is.
 DEFCONF(spamd_address, 172.29.199.179)
 DEFCONF(spamd_port, 783)
@@ -37,6 +41,9 @@ DEFCONF(spamd_port, 783)
 ## Default spam limit for incoming mail (multiplied by ten).
 DEFCONF(spam_max, 50)
 
+## Userv stuff for debugging.
+DEFCONF(userv_opts, )
+
 ## Which interfaces to listen on.  Exim checks for the literal string `::0'
 ## when setting things up: don't use `::', or we'll be tripped up by Linux's
 ## demented non-`IPV6_V6ONLY' behaviour.
@@ -55,7 +62,7 @@ DEFCONF(alias_file, /etc/aliases)
 DEFCONF(ca_dir, /etc/ca)
 
 ## User address suffix handling.
-DEFCONF(user_suffix_list, -* : +*)
+DEFCONF(user_suffix_list, +* : -*)
 DEFCONF(user_extaddr_regexp, $acl_c_user([-+@]|\$))
 DEFCONF(user_extaddr_fixup, ${sg {$local_part_suffix}{^[-+]}{}})