You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2006/09/04 11:25:19 UTC

svn commit: r439992 - /spamassassin/rules/trunk/sandbox/dos/70_other.cf

Author: dos
Date: Mon Sep  4 02:25:16 2006
New Revision: 439992

URL: http://svn.apache.org/viewvc?view=rev&rev=439992
Log:
sandbox: fix DOS_FAKE_SQUIRREL rule

Modified:
    spamassassin/rules/trunk/sandbox/dos/70_other.cf

Modified: spamassassin/rules/trunk/sandbox/dos/70_other.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/dos/70_other.cf?view=diff&rev=439992&r1=439991&r2=439992
==============================================================================
--- spamassassin/rules/trunk/sandbox/dos/70_other.cf (original)
+++ spamassassin/rules/trunk/sandbox/dos/70_other.cf Mon Sep  4 02:25:16 2006
@@ -53,12 +53,13 @@
 
 # http://www.squirrelmail.org/docs/user/user-3.html#ss3.1
 # mids: 1123.145.23.250.17.squirrel@webserveraddress
+# Message-ID: <12...@cyan.dostech.net>
 header __DOS_UA_SM	User-Agent =~ /SquirrelMail/
 header __DOS_MAILER_SM	X-Mailer =~ /SquirrelMail/
 header __DOS_RELAY_SM	Received =~ /SquirrelMail authenticated/
-header __DOS_SM_MID	Message-ID =~ /^\d{4}\.\d{3}\.\d{2}\.\d{3}\.\d{2}\.squirrel\@[A-Za-z0-9._-]+/
+header __DOS_SM_MID	Message-ID =~ /^<\d{4}(?:\.\d{1,3}){4}(?:\.\d{10})?\.squirrel\@[A-Za-z0-9._-]+>$/
 
-meta DOS_FAKE_SQUIRREL		(__DOS_UA_SM || __DOS_MAILER_SM) && (!__DO_RELAY_SM || !__DOS_SM_MID)
+meta DOS_FAKE_SQUIRREL		__DOS_MAILER_SM || (__DOS_UA_SM && (!__DOS_RELAY_SM || !__DOS_SM_MID))
 describe DOS_FAKE_SQUIRREL	Message contains faked SquirrelMail headers