From 975a8822c32d969fb2cd6108b3ec8e278f6b0e77 Mon Sep 17 00:00:00 2001
From: chip <chip>
Date: Tue, 9 Sep 2003 16:01:57 +0000
Subject: [PATCH] 	* support/export/hostname.c (get_reliable_hostbyaddr):
 Fix crash 	on invalid reverse DNS.

---
 ChangeLog                 |  5 +++++
 support/export/hostname.c | 45 +++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 26fc697..279c1f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-09  Chip Salzenberg  <chip@pobox.com>
+
+	* support/export/hostname.c (get_reliable_hostbyaddr): Fix crash
+	on invalid reverse DNS.
+
 2003-08-22  Chip Salzenberg  <chip@pobox.com>
 
 	* utils/statd/{log.h,log.c}: Rename log() to note() and L_* to
diff --git a/support/export/hostname.c b/support/export/hostname.c
index f88e0a4..3957d80 100644
--- a/support/export/hostname.c
+++ b/support/export/hostname.c
@@ -224,46 +224,45 @@ matchhostname (const char *h1, const char *h2)
 struct hostent *
 get_reliable_hostbyaddr(const char *addr, int len, int type)
 {
-	struct hostent *hp;
+	struct hostent *hp = NULL;
 
+	struct hostent *reverse;
+	struct hostent *forward;
 	char **sp;
-	struct hostent *forward = NULL;
-	char *tmpname;
 
-	hp = gethostbyaddr(addr, len , type);
-	if (!hp)
-		return hp;
+	reverse = gethostbyaddr (addr, len, type);
+	if (!reverse)
+		return NULL;
 
 	/* must make sure the hostent is authorative. */
 
-	hp = hostent_dup (hp);
-	tmpname = xstrdup((hp)->h_name);
-	if (tmpname) {
-		forward = gethostbyname(tmpname);
-		free(tmpname);
-	}
+	reverse = hostent_dup (reverse);
+	forward = gethostbyname (reverse->h_name);
+
 	if (forward) {
 		/* now make sure the "addr" is in the list */
 		for (sp = forward->h_addr_list ; *sp ; sp++) {
-			if (memcmp(*sp, addr, forward->h_length)==0)
+			if (memcmp (*sp, addr, forward->h_length) == 0)
 				break;
 		}
-		
-		if (!*sp) {
+
+		if (*sp) {
+			/* it's valid */
+			hp = hostent_dup (forward);
+		}
+		else {
 			/* it was a FAKE */
-			xlog(L_WARNING, "Fake hostname %s for %s - forward lookup doesn't match reverse",
-			     forward->h_name, inet_ntoa(*(struct in_addr*)addr));
-			return NULL;
+			xlog (L_WARNING, "Fake hostname %s for %s - forward lookup doesn't match reverse",
+			      reverse->h_name, inet_ntoa(*(struct in_addr*)addr));
 		}
-		free (hp);
-		hp = hostent_dup (forward);
 	}
 	else {
 		/* never heard of it. misconfigured DNS? */
-		xlog(L_WARNING, "Fake hostname %s for %s - forward lookup doesn't exist",
-		     forward->h_name, inet_ntoa(*(struct in_addr*)addr));
-		return NULL;
+		xlog (L_WARNING, "Fake hostname %s for %s - forward lookup doesn't exist",
+		      reverse->h_name, inet_ntoa(*(struct in_addr*)addr));
 	}
+
+	free (reverse);
 	return hp;
 }
 
-- 
2.39.5