From 2d07ce2339f00513906be2c9fa9aa4e64d36c48b Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 26 Oct 2020 13:01:54 +0000 Subject: [PATCH] [Minor] Grrr for grrr --- src/libserver/maps/map_helpers.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libserver/maps/map_helpers.c b/src/libserver/maps/map_helpers.c index e642682eee..de6b849f34 100644 --- a/src/libserver/maps/map_helpers.c +++ b/src/libserver/maps/map_helpers.c @@ -537,7 +537,7 @@ rspamd_map_helper_insert_radix_resolve (gpointer st, gconstpointer key, gconstpo } else { msg_warn_map ("duplicate radix entry found for map %s: %s (old value: '%s', new: '%s')", - map->name, key, kh_value (r->htb, k), val); + map->name, key, val->value, value); } nk = kh_key (r->htb, k).begin; @@ -591,7 +591,7 @@ rspamd_map_helper_insert_hash (gpointer st, gconstpointer key, gconstpointer val } else { msg_warn_map ("duplicate hash entry found for map %s: %s (old value: '%s', new: '%s')", - map->name, key, kh_value (ht->htb, k), val); + map->name, key, val->value, value); } } @@ -642,9 +642,9 @@ rspamd_map_helper_insert_re (gpointer st, gconstpointer key, gconstpointer value /* Always warn about regexp duplicate as it's likely a bad mistake */ msg_warn_map ("duplicate re entry found for map %s: %s (old value: '%s', new: '%s')", - map->name, key, kh_value (re_map->htb, k)->value, val); + map->name, key, val->value, value); - if (strcmp (kh_value (re_map->htb, k)->value, val->value) == 0) { + if (strcmp (val->value, value) == 0) { /* Same value, skip */ return; } -- 2.47.3