diff options
| author |   gilles <gilles@poolp.org> | 2016-07-05 23:38:17 +0200 |
|---|---|---|
| committer | gilles <gilles@poolp.org> | 2016-07-05 23:38:17 +0200 |
| commit | 751c7b6b56a13a2381485daf0f97dd7fc0da289e (patch) | |
| tree | 7b7129a05abea4c737dd9385b997458d5834a4f8 | |
| parent | Merge branch 'master' of ssh://ssh.poolp.org/git/opensmtpd-extras (diff) | |
| download | OpenSMTPD-extras-751c7b6b56a13a2381485daf0f97dd7fc0da289e.tar.xz OpenSMTPD-extras-751c7b6b56a13a2381485daf0f97dd7fc0da289e.zip | |
merge parse_response in proceed
| -rw-r--r-- | extras/filters/filter-rspamd/rspamd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extras/filters/filter-rspamd/rspamd.c b/extras/filters/filter-rspamd/rspamd.c index e4f1e27..76cbbbe 100644 --- a/extras/filters/filter-rspamd/rspamd.c +++ b/extras/filters/filter-rspamd/rspamd.c @@ -321,6 +321,9 @@ rspamd_spam_headers(struct transaction *tx) int rspamd_proceed(struct transaction *tx) { + if (! rspamd_parse_response(tx)) + return 0; + switch (tx->rspamd.action) { case NO_ACTION: return 1; @@ -388,9 +391,6 @@ rspamd_io(struct io *io, int evt) /* we're done with rspamd, if there was a local error * during transaction, reject now, else move forward. */ - if (! rspamd_parse_response(tx)) - goto fail; - if (! rspamd_proceed(tx)) goto fail; |