From: Andrew Lewis <nerf@judo.za.org>
Date: Wed, 14 Jun 2017 12:53:54 +0000 (+0200)
Subject: [Fix] Milter: Don't defer on "greylist" action
X-Git-Tag: 1.6.1~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e7d4ba71b13d591a12cc1556e8b34b10339b58d5;p=rspamd.git

[Fix] Milter: Don't defer on "greylist" action
---

diff --git a/src/libserver/milter.c b/src/libserver/milter.c
index e6b40a70b..a564b3b2e 100644
--- a/src/libserver/milter.c
+++ b/src/libserver/milter.c
@@ -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
+}