[minion-cvs] Make blacklist file less ambiguos; thanks to Noise and ...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/etc
In directory moria.mit.edu:/tmp/cvs-serv14188/etc

Modified Files:
	blacklist.conf 
Log Message:
Make blacklist file less ambiguos; thanks to Noise and Lucky Green for comments

Index: blacklist.conf
===================================================================
RCS file: /home/minion/cvsroot/src/minion/etc/blacklist.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- blacklist.conf	4 Jan 2003 20:40:49 -0000	1.1
+++ blacklist.conf	6 Jan 2003 03:26:36 -0000	1.2
@@ -10,29 +10,38 @@
 #
 #   1. Do not deliver to the address "onesuch@wangafu.net".
 #
-#Address onesuch@wangafu.net
+#Deny address onesuch@wangafu.net
 #
-#   2. Do not deliver to any user named 'postmaster'.
+#   2. Do not deliver to any user named 'postmaster' on any host.
 #
-#User postmaster
+#Deny user postmaster
 #
-#   3. Do not deliver to any address in the domain 'foo.gov'.
+#   3. Do not deliver to any address on the host 'foo.gov'.  This blocks
+#      mail to "bob@foo.gov", but not to "bob@ftp.foo.gov"
 #
-#Domain foo.gov
+#Deny onehost foo.gov
 #
-#   4. In fact, don't deliver to any address in any subdomain of 'foo.gov'.
+#   4. Do not deliver to any address on the host 'foo.gov', or to any address
+#      on any host rooted in 'foo.gov'.  This blocks mail to "bob@foo.gov",
+#      "bob@ftp.foo.gov", and "bob@mail.subdomain.foo.gov".
 #
-#Subdomains foo.gov
+#      Watch out!  You probably shouldn't use this option for any domain that
+#      has a diverse internal structure.  Just because the admins at foo.edu
+#      don't want anonymous messages sent to their mailservers, you shouldn't
+#      automatically infer that the users of experimental-server.foo.edu
+#      want to be blocked as well.
+#
+#Deny allhosts foo.gov
 #
 #   5. Don't deliver to any address that contains the word 'spam'.
 #
-#Pattern /spam/
+#Deny pattern /spam/
 #
 #   6. Don't deliver to any address with an even number of characters.
 #
-#Pattern /^(..)*$/
+#Deny pattern /^(..)*$/
 
 #   Now, here's a sample to get you started.
-User postmaster
-User root
-Subdomains whitehouse.gov
+Deny user root
+Deny user postmaster
+Deny allhosts whitehouse.gov