From ead6d252545e867d8e1c8b0dcbc7ca20dd152e37 Mon Sep 17 00:00:00 2001
From: Nigel Horne <njh@clamav.net>
Date: Fri, 3 Aug 2007 09:09:13 +0000
Subject: [PATCH] Better use of res_init()

git-svn: trunk@3163
---
 ChangeLog                     |  6 +++++-
 clamav-milter/clamav-milter.c | 38 ++++++++++++++---------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 590f78be0..a1d4e737c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+Fri Aug  3 09:21:12 BST 2007 (njh)
+----------------------------------
+  * clamav-milter/clamav-milter.c:	Better use of res_init()
+
 Thu Jul 19 12:13:33 BST 2007 (njh)
 ----------------------------------
-  * clamav-milter/clamav-milter.c:	HP-UX doesn't have EX_CONFIG, repoted
+  * clamav-milter/clamav-milter.c:	HP-UX doesn't have EX_CONFIG, reported
 				by clam * ministry.se
 
 Tue Jul 17 11:41:31 BST 2007 (trog)
diff --git a/clamav-milter/clamav-milter.c b/clamav-milter/clamav-milter.c
index b2e9eefe3..413e8c69b 100644
--- a/clamav-milter/clamav-milter.c
+++ b/clamav-milter/clamav-milter.c
@@ -33,7 +33,7 @@
  */
 static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.312 2007/02/12 22:24:21 njh Exp $";
 
-#define	CM_VERSION	"devel-190707"
+#define	CM_VERSION	"devel-030807"
 
 #if HAVE_CONFIG_H
 #include "clamav-config.h"
@@ -1974,7 +1974,7 @@ main(int argc, char **argv)
 	}
 
 	if(smfi_register(smfilter) == MI_FAILURE) {
-		cli_errmsg("smfi_register failure\n");
+		cli_errmsg("smfi_register failure, ensure that you have linked against the correct version of sendmail\n");
 		return EX_UNAVAILABLE;
 	}
 
@@ -1994,6 +1994,13 @@ main(int argc, char **argv)
 	logg(_("Starting %s\n"), clamav_version);
 	logg(_("*Debugging is on\n"));
 
+	if(!(_res.options&RES_INIT))
+		if(res_init() < 0) {
+			fprintf(stderr, "%s: Can't initialise the resolver\n",
+				argv[0]);
+			return EX_UNAVAILABLE;
+		}
+
 	if(blacklist_time) {
 		char name[MAXHOSTNAMELEN + 1];
 
@@ -5959,7 +5966,7 @@ mx(const char *host, table_t *t)
 {
 	u_char *p, *end;
 	const HEADER *hp;
-	int len, i, was_initialised;
+	int len, i;
 	union {
 		HEADER h;
 		u_char u[PACKETSZ];
@@ -5973,34 +5980,20 @@ mx(const char *host, table_t *t)
 			return NULL;
 	}
 
-	was_initialised = _res.options & RES_INIT;
-
-	if((!was_initialised) && res_init() < 0)
-		return t;
-
 	len = res_query(host, C_IN, T_MX, (u_char *)&q, sizeof(q));
-	if(len < 0) {
-		if(!was_initialised)
-			res_close();
+	if(len < 0)
 		return t;	/* Host has no MX records */
-	}
 
-	if((unsigned int)len > sizeof(q)) {
-		if(!was_initialised)
-			res_close();
+	if((unsigned int)len > sizeof(q))
 		return t;
-	}
 
 	hp = &(q.h);
 	p = q.u + HFIXEDSZ;
 	end = q.u + len;
 
 	for(i = ntohs(hp->qdcount); i--; p += len + QFIXEDSZ)
-		if((len = dn_skipname(p, end)) < 0) {
-			if(!was_initialised)
-				res_close();
+		if((len = dn_skipname(p, end)) < 0)
 			return t;
-		}
 
 	i = ntohs(hp->ancount);
 
@@ -6034,9 +6027,6 @@ mx(const char *host, table_t *t)
 		} else
 			t = resolve(buf, t);
 	}
-	if(!was_initialised)
-		res_close();
-
 	return t;
 }
 
@@ -6126,6 +6116,8 @@ resolve(const char *host, table_t *t)
  *	causing a loop
  * Return 1 if SPF says this email is from a legitimate source
  *	0 for fail or unknown
+ *
+ * TODO: check res_query is thread safe
  */
 static int
 spf(struct privdata *privdata, table_t *prevhosts)