config.m4, base.m4: Make the `admin_groups' setting a config knob.

It wants to be overridden in testing.

diff --git a/base.m4 b/base.m4
index 3b3d82f8aeaa3d19da5e315c7d10df5d7c6d5fa3..9182a7c7e9d46db20135a785ab88c44cffa4a34a 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -25,7 +25,7 @@
 ### Global settings.
 
 SECTION(global, priv)m4_dnl
-admin_groups = root : adm
+admin_groups = CONF_admin_groups
 prod_requires_admin = false
 
 SECTION(global, logging)m4_dnl

diff --git a/config.m4 b/config.m4
index e9b1e354971fa371fc395aad8e1106055777c584..94d33603035a69f2a5858353281d195eff8c278c 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -30,6 +30,9 @@ DEFCONF(smarthost, mail.distorted.org.uk)
 ## The user who runs verification filters.
 DEFCONF(filter_user, Debian-exim)
 
+## Administrative groups.
+DEFCONF(admin_groups, root : adm)
+
 ## Where the spam filter is.
 DEFCONF(spamd_address, 172.29.199.179)
 DEFCONF(spamd_port, 783)