From c18e3f0450cd97b85cd569edd4a06bcda66fdef4 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 28 Aug 2015 15:48:14 +0100 Subject: [PATCH] Fix other compatibility issues. --- src/libserver/buffer.c | 1 + src/smtp_proxy.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libserver/buffer.c b/src/libserver/buffer.c index 7c0311e5b..4c6ee2776 100644 --- a/src/libserver/buffer.c +++ b/src/libserver/buffer.c @@ -33,6 +33,7 @@ #define G_DISPATCHER_ERROR dispatcher_error_quark () #define debug_ip(...) rspamd_conditional_debug (NULL, \ NULL, \ + d->pool->tag.tagname, d->pool->tag.uid, \ G_STRFUNC, \ __VA_ARGS__) diff --git a/src/smtp_proxy.c b/src/smtp_proxy.c index 0e9c32eb6..de9854a34 100644 --- a/src/smtp_proxy.c +++ b/src/smtp_proxy.c @@ -659,7 +659,7 @@ smtp_dns_cb (struct rdns_reply *reply, void *arg) /* Parse reverse reply and start resolve of this ip */ if (reply->code != RDNS_RC_NOERROR) { rspamd_conditional_debug (rspamd_main->logger, - NULL, G_STRFUNC, "DNS error: %s", + NULL, "rdns", NULL, G_STRFUNC, "DNS error: %s", rdns_strerror (reply->code)); if (reply->code == RDNS_RC_NXDOMAIN) { @@ -688,7 +688,7 @@ smtp_dns_cb (struct rdns_reply *reply, void *arg) case SMTP_PROXY_STATE_RESOLVE_NORMAL: if (reply->code != RDNS_RC_NOERROR) { rspamd_conditional_debug (rspamd_main->logger, - NULL, G_STRFUNC, "DNS error: %s", + NULL, "rdns", NULL, G_STRFUNC, "DNS error: %s", rdns_strerror (reply->code)); if (reply->code == RDNS_RC_NXDOMAIN) { -- 2.39.5