From cee0ee2828be1c7e7791fd96401857dca0a60c94 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 2 Jun 2017 15:46:04 +0100
Subject: [Minor] Kill other `rmilter` occurrencies
---
src/libserver/mempool_vars_internal.h | 2 +-
src/libserver/protocol.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'src/libserver')
diff --git a/src/libserver/mempool_vars_internal.h b/src/libserver/mempool_vars_internal.h
index f566b78af..94f7f8f02 100644
--- a/src/libserver/mempool_vars_internal.h
+++ b/src/libserver/mempool_vars_internal.h
@@ -28,7 +28,7 @@
#define RSPAMD_MEMPOOL_SPF_DOMAIN "spf_domain"
#define RSPAMD_MEMPOOL_PRINCIPAL_RECIPIENT "principal_recipient"
#define RSPAMD_MEMPOOL_PROFILE "profile"
-#define RSPAMD_MEMPOOL_RMILTER_REPLY "rmilter_reply"
+#define RSPAMD_MEMPOOL_MILTER_REPLY "milter_reply"
#define RSPAMD_MEMPOOL_DKIM_SIGNATURE "dkim-signature"
#define RSPAMD_MEMPOOL_DMARC_CHECKS "dmarc_checks"
#define RSPAMD_MEMPOOL_DKIM_BH_CACHE "dkim_bh_cache"
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 2bfcdd6d1..99e965af1 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -1077,7 +1077,7 @@ rspamd_protocol_write_ucl (struct rspamd_task *task,
{
ucl_object_t *top = NULL;
GString *dkim_sig;
- const ucl_object_t *rmilter_reply;
+ const ucl_object_t *milter_reply;
struct rspamd_saved_protocol_reply *cached;
static const gchar *varname = RSPAMD_MEMPOOL_CACHED_REPLY;
@@ -1180,16 +1180,16 @@ rspamd_protocol_write_ucl (struct rspamd_task *task,
}
if (flags & RSPAMD_PROTOCOL_RMILTER) {
- rmilter_reply = rspamd_mempool_get_variable (task->task_pool,
- RSPAMD_MEMPOOL_RMILTER_REPLY);
+ milter_reply = rspamd_mempool_get_variable (task->task_pool,
+ RSPAMD_MEMPOOL_MILTER_REPLY);
- if (rmilter_reply) {
+ if (milter_reply) {
if (task->cmd == CMD_CHECK_V2) {
- ucl_object_insert_key (top, ucl_object_ref (rmilter_reply),
+ ucl_object_insert_key (top, ucl_object_ref (milter_reply),
"milter", 0, false);
}
else {
- ucl_object_insert_key (top, ucl_object_ref (rmilter_reply),
+ ucl_object_insert_key (top, ucl_object_ref (milter_reply),
"rmilter", 0, false);
}
}
--
cgit v1.2.3