You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2024/09/25 00:56:53 UTC
svn commit: r1920888 - /spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Author: jhardin
Date: Wed Sep 25 00:56:52 2024
New Revision: 1920888
URL: http://svn.apache.org/viewvc?rev=1920888&view=rev
Log:
Clean up fallout from DNSWL rules no longer being installed by default - BUG#8193
Modified:
spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf?rev=1920888&r1=1920887&r2=1920888&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Wed Sep 25 00:56:52 2024
@@ -1679,9 +1679,9 @@ meta __XPRIO_MINFP __XPRIO &
ifplugin Mail::SpamAssassin::Plugin::DKIM
ifplugin Mail::SpamAssassin::Plugin::SPF
- meta XPRIO __XPRIO_MINFP && !DKIM_SIGNED && !DKIM_VALID && !DKIM_VALID_AU && !RCVD_IN_DNSWL_NONE && !SPF_PASS
+ meta XPRIO __XPRIO_MINFP && !DKIM_SIGNED && !DKIM_VALID && !DKIM_VALID_AU && !SPF_PASS # && !RCVD_IN_DNSWL_NONE
else
- meta XPRIO __XPRIO_MINFP && !DKIM_SIGNED && !DKIM_VALID && !DKIM_VALID_AU && !RCVD_IN_DNSWL_NONE
+ meta XPRIO __XPRIO_MINFP && !DKIM_SIGNED && !DKIM_VALID && !DKIM_VALID_AU # && !RCVD_IN_DNSWL_NONE
endif
tflags XPRIO net
else
@@ -2550,12 +2550,12 @@ score TEQF_USR_POLITE
meta __MSGID_HEX_MALF __MSGID_NOFQDN2 && __MSGID_OK_HEX
meta __URI_ONLY_MSGID_MALF __BODY_URI_ONLY && __MSGID_NOFQDN2
-#ifplugin Mail::SpamAssassin::Plugin::DNSEval
- meta URI_ONLY_MSGID_MALF __URI_ONLY_MSGID_MALF && !__RP_MATCHES_RCVD && !__URI_MAILTO && !__NOT_SPOOFED && !__DKIM_EXISTS && !__MSGID_JAVAMAIL && !__HAS_REPLY_TO && !RCVD_IN_DNSWL_LOW
- tflags URI_ONLY_MSGID_MALF net
-#else
+# #ifplugin Mail::SpamAssassin::Plugin::DNSEval
+# meta URI_ONLY_MSGID_MALF __URI_ONLY_MSGID_MALF && !__RP_MATCHES_RCVD && !__URI_MAILTO && !__NOT_SPOOFED && !__DKIM_EXISTS && !__MSGID_JAVAMAIL && !__HAS_REPLY_TO && !RCVD_IN_DNSWL_LOW
+# tflags URI_ONLY_MSGID_MALF net
+# #else
meta URI_ONLY_MSGID_MALF __URI_ONLY_MSGID_MALF && !__RP_MATCHES_RCVD && !__URI_MAILTO && !__NOT_SPOOFED && !__DKIM_EXISTS && !__MSGID_JAVAMAIL && !__HAS_REPLY_TO
-#endif
+# #endif
describe URI_ONLY_MSGID_MALF URI only + malformed message ID
score URI_ONLY_MSGID_MALF 2.000 # limit
tflags URI_ONLY_MSGID_MALF publish