config.m4, spam.m4: Hack in configurable Userv options.

Mainly useful so that you can say `--spoof-user Debian-exim' when
testing.

diff --git a/config.m4 b/config.m4
index 94d3360..c4931fe 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -40,6 +40,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.

diff --git a/spam.m4 b/spam.m4
index 7be5a36..f444346 100644 (file)
--- a/spam.m4
+++ b/spam.m4
@@ -68,7 +68,7 @@ fetch_spam_limit:
                ${if and {{!eq{$acl_c_mode}{submission}} \
                          {exists {CONF_userconf_dir/spam-limit.userv}}} \
                     {${run {/usr/bin/timeout 5s -- \
-                               userv SHQUOTE($local_part) exim-spam-limit \
+                               userv CONF_userv_opts SHQUOTE($local_part) exim-spam-limit \
                                        SHQUOTE($sender_address) \
                                        SHQUOTE($local_part_prefix) \
                                        SHQUOTE($local_part) \