From: David Hankins <dhankins@isc.org>
Date: Fri, 1 Jun 2007 22:11:49 +0000 (+0000)
Subject: - A bug was fixed in interface discovery wherein an error identifying
X-Git-Tag: v4_0_0a2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f796f70a27b89d828a60e025f15bbb87635ca5c4;p=thirdparty%2Fdhcp.git

- A bug was fixed in interface discovery wherein an error identifying
  a server-configured interface with no IPv4 addresses would SEGV.
  [ISC-Bugs #16896]
---

diff --git a/RELNOTES b/RELNOTES
index eda78b8e3..014fdebb0 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -56,6 +56,8 @@ suggested fixes to <dhcp-users@isc.org>.
 
 - Fix for icmp packets on 64-bit systems (bug introduced in 4.0).
 
+- A bug was fixed in interface discovery wherein an error identifying
+  a server-configured interface with no IPv4 addresses would SEGV.
 
 			Changes since 4.0.0-20070413
 
diff --git a/common/discover.c b/common/discover.c
index e9c7d44c4..1fc46b4b5 100644
--- a/common/discover.c
+++ b/common/discover.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: discover.c,v 1.58 2007/05/19 23:28:38 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: discover.c,v 1.59 2007/06/01 22:11:49 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1054,7 +1054,9 @@ discover_interfaces(int state) {
 			if (local_family == AF_INET) {
 				log_error("No subnet declaration for %s (%s).",
 					  tmp->name, 
-					  inet_ntoa(tmp->addresses[0]));
+					  (tmp->addresses == NULL) ?
+					   "no IPv4 addresses" :
+					   inet_ntoa(tmp->addresses[0]));
 #ifdef DHCPv6
 			} else {
 				if (tmp->v6addresses != NULL) {
@@ -1063,7 +1065,7 @@ discover_interfaces(int state) {
 						  abuf,
 						  sizeof(abuf));
 				} else {
-					strcpy(abuf, "no addresses");
+					strcpy(abuf, "no IPv6 addresses");
 				}
 				log_error("No subnet declaration for %s (%s).",
 					  tmp->name,