From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 21 Aug 2014 14:47:51 +0000 (+0100)
Subject: Allow to skip session in dns resolver.
X-Git-Tag: 0.7.0~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6d3bbb1a744673cf898284f345935467a7179bb;p=thirdparty%2Frspamd.git

Allow to skip session in dns resolver.
---

diff --git a/src/libserver/dns.c b/src/libserver/dns.c
index 72903a6cfa..dae19e8496 100644
--- a/src/libserver/dns.c
+++ b/src/libserver/dns.c
@@ -64,7 +64,9 @@ rspamd_dns_callback (struct rdns_reply *reply, gpointer ud)
 	 * event removing
 	 */
 	rdns_request_retain (reply->request);
-	remove_normal_event (reqdata->session, rspamd_dns_fin_cb, reqdata->req);
+	if (reqdata->session) {
+		remove_normal_event (reqdata->session, rspamd_dns_fin_cb, reqdata->req);
+	}
 }
 
 gboolean
@@ -89,15 +91,17 @@ make_dns_request (struct rspamd_dns_resolver *resolver,
 			resolver->request_timeout, resolver->max_retransmits, 1, name,
 			type);
 
-	if (req != NULL) {
-		register_async_event (session,
-			(event_finalizer_t)rspamd_dns_fin_cb,
-			req,
-			g_quark_from_static_string ("dns resolver"));
-		reqdata->req = req;
-	}
-	else {
-		return FALSE;
+	if (session) {
+		if (req != NULL) {
+			register_async_event (session,
+					(event_finalizer_t)rspamd_dns_fin_cb,
+					req,
+					g_quark_from_static_string ("dns resolver"));
+			reqdata->req = req;
+		}
+		else {
+			return FALSE;
+		}
 	}
 
 	return TRUE;