summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgilles <gilles@openbsd.org>2018-11-25 14:29:24 +0000
committergilles <gilles@openbsd.org>2018-11-25 14:29:24 +0000
commit026435b65f4687aec75ef3af48ba3029de30bdfb (patch)
tree21a828127091b3949de3383177c0ffc10f116581
parentprint more details about the join'd networks we have saved when a user runs (diff)
downloadwireguard-openbsd-026435b65f4687aec75ef3af48ba3029de30bdfb.tar.xz
wireguard-openbsd-026435b65f4687aec75ef3af48ba3029de30bdfb.zip
teach mail.maildir how to junk SpamAssassin flagged spam
reported by Thuban <thuban@yeuxdelibad.net>
-rw-r--r--usr.sbin/smtpd/mail.maildir.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/mail.maildir.c b/usr.sbin/smtpd/mail.maildir.c
index 501514a5a79..7612a7343f2 100644
--- a/usr.sbin/smtpd/mail.maildir.c
+++ b/usr.sbin/smtpd/mail.maildir.c
@@ -182,7 +182,9 @@ maildir_engine(const char *dirname, int junk)
line[strcspn(line, "\n")] = '\0';
if (line[0] == '\0')
in_hdr = 0;
- if (junk && in_hdr && strcmp(line, "X-Spam: yes") == 0)
+ if (junk && in_hdr &&
+ (strcasecmp(line, "x-spam: yes") == 0 ||
+ strcasecmp(line, "x-spam-flag: yes") == 0))
is_junk = 1;
fprintf(fp, "%s\n", line);
}