summaryrefslogtreecommitdiffstats
path: root/spamass-milter/message.diff
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xssn.at>2010-05-17 12:04:10 +0200
committerFlorian Pritz <bluewind@xssn.at>2010-05-17 12:04:10 +0200
commit545b0b7de32c86264d4ec1eb7b7610e4c1c85946 (patch)
tree9ad399ce5176aee3c98f216f54a12a3e6d5290c6 /spamass-milter/message.diff
parent8dc1d552c0bab7b72371c3a1529e365410c7548c (diff)
parentac57415603ea60e9af632e70827dffa22cfff584 (diff)
downloadaur-packages-545b0b7de32c86264d4ec1eb7b7610e4c1c85946.tar.gz
aur-packages-545b0b7de32c86264d4ec1eb7b7610e4c1c85946.tar.xz
Merge branch 'master' of git://git.server-speed.net/~flo/git/aur
Diffstat (limited to 'spamass-milter/message.diff')
-rw-r--r--spamass-milter/message.diff15
1 files changed, 15 insertions, 0 deletions
diff --git a/spamass-milter/message.diff b/spamass-milter/message.diff
new file mode 100644
index 0000000..53a32c3
--- /dev/null
+++ b/spamass-milter/message.diff
@@ -0,0 +1,15 @@
+--- src/spamass-milter-0.3.1/spamass-milter.cpp 2006-03-23 22:41:36.000000000 +0100
++++ src_new/spamass-milter-0.3.1/spamass-milter.cpp 2010-01-02 01:52:00.000000000 +0100
+@@ -451,8 +451,10 @@
+ }
+ if (do_reject)
+ {
+- debug(D_MISC, "Rejecting");
+- smfi_setreply(ctx, "550", "5.7.1", "Blocked by SpamAssassin");
++ const char *spam_status = assassin->spam_status().c_str();
++ debug(D_MISC, "Rejecting %s", smfi_getsymval(ctx,"i"));
++ debug(D_MISC, spam_status);
++ smfi_setreply(ctx, "550", "5.7.1", "Your message seems to be Spam. Please contact postmaster@server-speed.net for more information.");
+
+
+ if (flag_bucket)