From 340e44fdf840011ab9cc98bf993c1a258e51da11 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pzhukov@redhat.com>
Date: Mar 20 2018 18:56:35 +0000
Subject: Get all hardware addresses for xid generation


---

diff --git a/dhcp-iface_hwaddr_discovery.patch b/dhcp-iface_hwaddr_discovery.patch
new file mode 100644
index 0000000..17aeb14
--- /dev/null
+++ b/dhcp-iface_hwaddr_discovery.patch
@@ -0,0 +1,27 @@
+diff --git a/common/discover.c b/common/discover.c
+index 26a78ca..0618d3f 100644
+--- a/common/discover.c
++++ b/common/discover.c
+@@ -722,11 +722,6 @@ discover_interfaces(int state) {
+ 	}
+ 
+ 
+-	/* If we're just trying to get a list of interfaces that we might
+-	   be able to configure, we can quit now. */
+-	if (state == DISCOVER_UNCONFIGURED) {
+-		return;
+-	}
+ 
+ 	/* Weed out the interfaces that did not have IP addresses. */
+ 	tmp = last = next = NULL;
+@@ -923,6 +918,10 @@ discover_interfaces(int state) {
+ 			interface_reference (&tmp, next, MDL);
+ 	}
+ 
++
++	if (state == DISCOVER_UNCONFIGURED) {
++		return;
++	}
+ 	/*
+ 	 * Now register all the remaining interfaces as protocols.
+ 	 * We register with omapi to allow for control of the interface,
diff --git a/dhcp.spec b/dhcp.spec
index eef571b..a5140ab 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.6
-Release:  9%{?dist}
+Release:  10%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -77,6 +77,7 @@ Patch38:  dhcp-dhclient-preinit6s.patch
 Patch40:  dhcp-4.3.6-omapi-leak.patch
 Patch42:  dhcp-4.3.6-options_overflow.patch
 Patch43:  dhcp-4.3.6-reference_count_overflow.patch
+Patch44:  dhcp-iface_hwaddr_discovery.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -343,6 +344,8 @@ rm bind/bind.tar.gz
 %patch42 -p1 
 %patch43 -p1
 
+%patch44 -p1 -b .xid_allifs
+
 # DHCLIENT_DEFAULT_PREFIX_LEN  64 -> 128
 # https://bugzilla.gnome.org/show_bug.cgi?id=656610
 sed -i -e 's|DHCLIENT_DEFAULT_PREFIX_LEN 64|DHCLIENT_DEFAULT_PREFIX_LEN 128|g' includes/site.h
@@ -669,6 +672,9 @@ done
 %endif
 
 %changelog
+* Tue Mar 20  2018 Pavel Zhukov <pzhukov@redhat.com> - 12:4.3.6-10
+- Get all hardware addresses for xid generation
+
 * Thu Mar  1 2018 Pavel Zhukov <pzhukov@redhat.com> - 12:4.3.6-9
 - Fix CVE-2018-5732 CVE-2018-5733 (#1550246)