From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 2 Jun 2017 14:43:00 +0000 (+0100)
Subject: [Rework] Stop using name 'rmilter' for the modern protocol
X-Git-Tag: 1.6.0~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e469f8928839d794e397796550c5e34ab6c40085;p=thirdparty%2Frspamd.git

[Rework] Stop using name 'rmilter' for the modern protocol
---

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 3bb829cab7..2bfcdd6d1d 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -1184,8 +1184,14 @@ rspamd_protocol_write_ucl (struct rspamd_task *task,
 				RSPAMD_MEMPOOL_RMILTER_REPLY);
 
 		if (rmilter_reply) {
-			ucl_object_insert_key (top, ucl_object_ref (rmilter_reply),
-					"rmilter", 0, false);
+			if (task->cmd == CMD_CHECK_V2) {
+				ucl_object_insert_key (top, ucl_object_ref (rmilter_reply),
+						"milter", 0, false);
+			}
+			else {
+				ucl_object_insert_key (top, ucl_object_ref (rmilter_reply),
+						"rmilter", 0, false);
+			}
 		}
 	}