]> source.dussan.org Git - rspamd.git/commitdiff
[Fix] Milter: Don't defer on "greylist" action
authorAndrew Lewis <nerf@judo.za.org>
Wed, 14 Jun 2017 12:53:54 +0000 (14:53 +0200)
committerAndrew Lewis <nerf@judo.za.org>
Wed, 14 Jun 2017 13:01:15 +0000 (15:01 +0200)
src/libserver/milter.c

index e6b40a70b7b9bfba34d98f53fb47a2e2c7ee5062..a564b3b2ec070690d097086dfd29f6831caf5340 100644 (file)
@@ -1491,7 +1491,6 @@ rspamd_milter_send_task_results (struct rspamd_milter_session *session,
                rspamd_milter_send_action (session, RSPAMD_MILTER_REJECT);
                break;
        case METRIC_ACTION_SOFT_REJECT:
-       case METRIC_ACTION_GREYLIST:
                rcode = rspamd_fstring_new_init (RSPAMD_MILTER_RCODE_TEMPFAIL,
                                sizeof (RSPAMD_MILTER_RCODE_TEMPFAIL) - 1);
                xcode = rspamd_fstring_new_init (RSPAMD_MILTER_XCODE_TEMPFAIL,
@@ -1535,6 +1534,7 @@ rspamd_milter_send_task_results (struct rspamd_milter_session *session,
                rspamd_milter_send_action (session, RSPAMD_MILTER_ACCEPT);
                break;
 
+       case METRIC_ACTION_GREYLIST:
        case METRIC_ACTION_NOACTION:
        default:
                rspamd_milter_send_action (session, RSPAMD_MILTER_ACCEPT);
@@ -1564,4 +1564,4 @@ rspamd_milter_get_session_pool (struct rspamd_milter_session *session)
        struct rspamd_milter_private *priv = session->priv;
 
        return priv->pool;
-}
\ No newline at end of file
+}