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

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 3bb829cab731039c2077681a67abf1508d2f0313..2bfcdd6d1d7c0e005838dfc679916637b60b88ef 100644 (file)
--- 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);
+                       }
                }
        }