Added blacklist command; fixed a few dodgy frees (oops)

1 files changed, 27 insertions, 7 deletions

diff --git a/doc/INSTRUCTION b/doc/INSTRUCTION
index e55fdef..9edde2a 100644
--- a/doc/INSTRUCTION
+++ b/doc/INSTRUCTION
@@ -23,6 +23,8 @@ order:
 
 [trusted settings]
 
+[blacklist settings]
+
 [subject macros]
 
 [domain settings]
@@ -107,7 +109,8 @@ Trusted settings
 ================
 
 These define users and domains for which mail is let thorugh, regardless of
-other tests.
+other tests.  These are not regular expressions - they are simply compared
+with a case-insignificant test.
 
     trusted_users
     {
@@ -122,6 +125,22 @@ other tests.
     }
 
 
+Blacklist settings
+==================
+
+These define domains for which mail will be deleted with extreme prejedice.
+
+    blacklist
+    {
+    	<domain regular expression>
+    	[<domain regular expression>]
+    }
+
+Note that unlike the trusted commands these are regular expressions.  It's
+probably fairly useless as I'd imagine most messages will have butchered
+'From:' fields, but heck, it's there if you need it.
+
+
 Subject Macros
 ==============
 
@@ -193,13 +212,14 @@ done in this order:
 1. If a trusted domain, allow message.
 2. If a trusted user, allow message.
 3. If an HTML message and these are blocked, delete message.
-4. If the domain is not matched in a domain command, allow message.
-5. If the subject is allowed for the domain, allow message.
-6. If the username is blocked for the domain, delete message.
-7. If the subject is disallowed for the domain, delete message.
-8. Delete the message if the default is to block.
+4. If the domain is blacklisted, delete message.
+5. If the domain is not matched in a domain command, allow message.
+6. If the subject is allowed for the domain, allow message.
+7. If the username is blocked for the domain, delete message.
+8. If the subject is disallowed for the domain, delete message.
+9. Delete the message if the default is to block, otherwise allow.
 
 
 
 -------------------------------------------------------------------------------
-$Id: INSTRUCTION,v 1.4 2003-12-08 02:20:14 ianc Exp $
+$Id: INSTRUCTION,v 1.5 2003-12-09 01:25:08 ianc Exp $