Author: billcole
Date: Wed Sep 22 20:49:07 2021
New Revision: 1893522
URL: http://svn.apache.org/viewvc?rev=1893522&view=rev
Log:
Bug 7921
Modified:
spamassassin/trunk/rules/20_dynrdns.cf
spamassassin/trunk/rules/20_fake_helo_tests.cf
Modified: spamassassin/trunk/rules/20_dynrdns.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dynrdns.cf?rev=1893522&r1=1893521&r2=1893522&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dynrdns.cf (original)
+++ spamassassin/trunk/rules/20_dynrdns.cf Wed Sep 22 20:49:07 2021
@@ -193,7 +193,7 @@ header __RDNS_DYNAMIC_ASAHI X-Spam-Rel
# exceptions (bug 5397):
# exceptions: 66-220-155-151.mail-mail.facebook.com
# exceptions: o167-89-97-77.outbound-mail.sendgrid.net (bug 7592)
-header __RDNS_STATIC X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:fix|static|fixip|dedicated|mail\-mail|outbound-mail)/i
+header __RDNS_STATIC X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:fix|static|fixip|dedicated|mail\-mail|outbound-mail|smtp)/i
# bug 5586:
header __CGATE_RCVD Received =~ /by \S+ \(CommuniGate Pro/
Modified: spamassassin/trunk/rules/20_fake_helo_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_fake_helo_tests.cf?rev=1893522&r1=1893521&r2=1893522&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_fake_helo_tests.cf (original)
+++ spamassassin/trunk/rules/20_fake_helo_tests.cf Wed Sep 22 20:49:07 2021
@@ -95,7 +95,7 @@ describe HELO_DYNAMIC_IPADDR Relay HELO'
# node-c-8b22.a2000.nl
# cm89.omega139.maxonline.com.sg
# cm114.gamma208.maxonline.com.sg
-header __HELO_DYNAMIC_DHCP X-Spam-Relays-External =~ /^[^\]]+ helo=\S*(?:(?<!a)cm|catv|docsis|cable|dsl|dhcp|cpe|node)\S*\d+[^\d\s]+\d+[^\]]+ auth= /i
+header __HELO_DYNAMIC_DHCP X-Spam-Relays-External =~ /^[^\]]+ helo=\S*(?:(?<!smtp)(?<!a)cm|catv|docsis|cable|dsl|dhcp|cpe|node)\S*\d+[^\d\s]+\d+[^\]]+ auth= /i
meta HELO_DYNAMIC_DHCP (__HELO_DYNAMIC_DHCP && !HELO_STATIC_HOST)
describe HELO_DYNAMIC_DHCP Relay HELO'd using suspicious hostname (DHCP)
Date: Wed Sep 22 20:49:07 2021
New Revision: 1893522
URL: http://svn.apache.org/viewvc?rev=1893522&view=rev
Log:
Bug 7921
Modified:
spamassassin/trunk/rules/20_dynrdns.cf
spamassassin/trunk/rules/20_fake_helo_tests.cf
Modified: spamassassin/trunk/rules/20_dynrdns.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dynrdns.cf?rev=1893522&r1=1893521&r2=1893522&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dynrdns.cf (original)
+++ spamassassin/trunk/rules/20_dynrdns.cf Wed Sep 22 20:49:07 2021
@@ -193,7 +193,7 @@ header __RDNS_DYNAMIC_ASAHI X-Spam-Rel
# exceptions (bug 5397):
# exceptions: 66-220-155-151.mail-mail.facebook.com
# exceptions: o167-89-97-77.outbound-mail.sendgrid.net (bug 7592)
-header __RDNS_STATIC X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:fix|static|fixip|dedicated|mail\-mail|outbound-mail)/i
+header __RDNS_STATIC X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:fix|static|fixip|dedicated|mail\-mail|outbound-mail|smtp)/i
# bug 5586:
header __CGATE_RCVD Received =~ /by \S+ \(CommuniGate Pro/
Modified: spamassassin/trunk/rules/20_fake_helo_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_fake_helo_tests.cf?rev=1893522&r1=1893521&r2=1893522&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_fake_helo_tests.cf (original)
+++ spamassassin/trunk/rules/20_fake_helo_tests.cf Wed Sep 22 20:49:07 2021
@@ -95,7 +95,7 @@ describe HELO_DYNAMIC_IPADDR Relay HELO'
# node-c-8b22.a2000.nl
# cm89.omega139.maxonline.com.sg
# cm114.gamma208.maxonline.com.sg
-header __HELO_DYNAMIC_DHCP X-Spam-Relays-External =~ /^[^\]]+ helo=\S*(?:(?<!a)cm|catv|docsis|cable|dsl|dhcp|cpe|node)\S*\d+[^\d\s]+\d+[^\]]+ auth= /i
+header __HELO_DYNAMIC_DHCP X-Spam-Relays-External =~ /^[^\]]+ helo=\S*(?:(?<!smtp)(?<!a)cm|catv|docsis|cable|dsl|dhcp|cpe|node)\S*\d+[^\d\s]+\d+[^\]]+ auth= /i
meta HELO_DYNAMIC_DHCP (__HELO_DYNAMIC_DHCP && !HELO_STATIC_HOST)
describe HELO_DYNAMIC_DHCP Relay HELO'd using suspicious hostname (DHCP)