summaryrefslogtreecommitdiff
path: root/spamassassin
diff options
context:
space:
mode:
authorroot <root@jones.dk>2016-10-25 18:45:50 +0200
committerroot <root@jones.dk>2016-10-25 18:45:50 +0200
commit356bff5e01f566ba3d4ed123714fd1ec1d5dbabd (patch)
treed328d8dee6a448d430fb88ec0c264752788387ce /spamassassin
parent60f00c0836e5ad590af2e8100d2c14466a9b67af (diff)
Enable shortcircuit ALL_TRUSTED.
Diffstat (limited to 'spamassassin')
-rw-r--r--spamassassin/local.cf2
-rw-r--r--spamassassin/local.cf.diff11
2 files changed, 11 insertions, 2 deletions
diff --git a/spamassassin/local.cf b/spamassassin/local.cf
index 530caa5..cc91b5f 100644
--- a/spamassassin/local.cf
+++ b/spamassassin/local.cf
@@ -81,7 +81,7 @@ ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
# if you have taken the time to correctly specify your "trusted_networks",
# this is another good way to save CPU
#
-# shortcircuit ALL_TRUSTED on
+shortcircuit ALL_TRUSTED on
# and a well-trained bayes DB can save running rules, too
#
diff --git a/spamassassin/local.cf.diff b/spamassassin/local.cf.diff
index 2c236b7..0da805e 100644
--- a/spamassassin/local.cf.diff
+++ b/spamassassin/local.cf.diff
@@ -1,5 +1,5 @@
--- local.cf.orig 2016-10-24 21:29:10.000000000 +0200
-+++ local.cf 2016-10-25 18:43:20.000000000 +0200
++++ local.cf 2016-10-25 18:45:29.000000000 +0200
@@ -15,18 +15,20 @@
# Save spam messages as a message/rfc822 MIME attachment instead of
# modifying the original message (0: off, 2: use text/plain instead)
@@ -33,6 +33,15 @@
# Some shortcircuiting, if the plugin is enabled
#
+@@ -79,7 +81,7 @@
+ # if you have taken the time to correctly specify your "trusted_networks",
+ # this is another good way to save CPU
+ #
+-# shortcircuit ALL_TRUSTED on
++shortcircuit ALL_TRUSTED on
+
+ # and a well-trained bayes DB can save running rules, too
+ #
@@ -87,3 +89,12 @@
# shortcircuit BAYES_00 ham