diff options
| author |   Joerg Jung <mail@umaxx.net> | 2015-05-16 22:03:11 +0200 |
|---|---|---|
| committer | Joerg Jung <mail@umaxx.net> | 2015-05-16 22:03:11 +0200 |
| commit | 7159504e85da25cc2c4e58e097dec5bbf142fdc2 (patch) | |
| tree | be8c22094259901218bdf0c7381079d03d02c252 | |
| parent | add manpages for most filters (diff) | |
| download | OpenSMTPD-extras-7159504e85da25cc2c4e58e097dec5bbf142fdc2.tar.xz OpenSMTPD-extras-7159504e85da25cc2c4e58e097dec5bbf142fdc2.zip | |
add enhanced error codesopensmtpd-extras-0000master-5.4.xextras-5.4.x
| -rw-r--r-- | extras/filters/filter-clamav/filter_clamav.c | 4 | ||||
| -rw-r--r-- | extras/filters/filter-spamassassin/filter_spamassassin.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extras/filters/filter-clamav/filter_clamav.c b/extras/filters/filter-clamav/filter_clamav.c index 9a18941..b3d4d48 100644 --- a/extras/filters/filter-clamav/filter_clamav.c +++ b/extras/filters/filter-clamav/filter_clamav.c @@ -235,14 +235,14 @@ clamav_on_eom(uint64_t id, size_t size) if (clamav_response(cl) == -1) { clamav_clear(cl); filter_api_set_udata(id, NULL); - return filter_api_reject_code(id, FILTER_FAIL, 471, "Virus filter failed"); + return filter_api_reject_code(id, FILTER_FAIL, 451, "4.7.1 Virus filter failed"); } r = cl->r; clamav_clear(cl); filter_api_set_udata(id, NULL); if (r) { log_warnx("warn: clamav_filter: on_eom: REJECT virus id=%016"PRIx64, id); - return filter_api_reject_code(id, FILTER_CLOSE, 554, "Virus"); + return filter_api_reject_code(id, FILTER_CLOSE, 554, "5.7.1 Virus found"); } return filter_api_accept(id); } diff --git a/extras/filters/filter-spamassassin/filter_spamassassin.c b/extras/filters/filter-spamassassin/filter_spamassassin.c index 5e3c2d4..2293f01 100644 --- a/extras/filters/filter-spamassassin/filter_spamassassin.c +++ b/extras/filters/filter-spamassassin/filter_spamassassin.c @@ -280,7 +280,7 @@ spamassassin_on_eom(uint64_t id, size_t size) if (spamassassin_response(sa, id) == -1) { spamassassin_clear(sa); filter_api_set_udata(id, NULL); - return filter_api_reject_code(id, FILTER_FAIL, 471, "Spam filter failed"); + return filter_api_reject_code(id, FILTER_FAIL, 451, "4.7.1 Spam filter failed"); } r = sa->r; spamassassin_clear(sa); @@ -292,7 +292,7 @@ spamassassin_on_eom(uint64_t id, size_t size) } if (spamassassin_strategy == SPAMASSASSIN_REJECT) { log_warnx("warn: spamassassin_filter: on_eom: REJECT spam id=%016"PRIx64, id); - return filter_api_reject_code(id, FILTER_CLOSE, 554, "Spam"); + return filter_api_reject_code(id, FILTER_CLOSE, 554, "5.7.1 Message considered spam"); } } return filter_api_accept(id); |