madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://"]
  insteadOf = madduck:

fix rules/admin eqdomain spamtrapping
authormartin f. krafft <>
Fri, 29 Feb 2008 14:42:15 +0000 (15:42 +0100)
committermartin f. krafft <>
Fri, 29 Feb 2008 14:42:15 +0000 (15:42 +0100)

index 8598da6c1ea1c01d2ec01a274a1408569eb7a203..7ba755ce79e73869d4dae287b086b37dd348fc16 100644 (file)
@@ -2,14 +2,16 @@
 * ORIG_DOMAIN ?? ^admin\.madduck\.net$
   # require that messages sent to have passed the
-  # machine at bar, meaning have been Delivered-To there.
+  # machine at bar, meaning have been Delivered-To there, or originating from
+  # there:
   *$ !^Delivered-To: .+@$EQ_DOMAIN
+  *$ !^Received:$RE_SPACE+by $EQ_DOMAIN
-    LOG="spamtrap message as it was never delivered to $EQ_DOMAIN$NL"
+    LOG="rules/admin: spamtrap message as never passed $EQ_DOMAIN$NL"
+    SPAMTRAPPED="never passed eqdomain"
     :0 fw
-    |$FORMAIL -A'X-Spamtrapped: not delivered to eqdomain'
+    |$FORMAIL -A"X-Spamtrapped: $SPAMTRAPPED"