From 6ed5c121b129b2aacef388113cd08fd18328aa6a Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pzhukov@redhat.com>
Date: Fri, 6 Apr 2018 13:00:29 +0200
Subject: [PATCH] Discover hwaddresses for all interfaces for xid uniqueness

---
 dhcp-iface_hwaddr_discovery.patch | 13 +++++++++++++
 dhcp.spec                         | 14 +++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 dhcp-iface_hwaddr_discovery.patch

diff --git a/dhcp-iface_hwaddr_discovery.patch b/dhcp-iface_hwaddr_discovery.patch
new file mode 100644
index 0000000..b63623c
--- /dev/null
+++ b/dhcp-iface_hwaddr_discovery.patch
@@ -0,0 +1,13 @@
+diff --git a/common/discover.c b/common/discover.c
+index 26a78ca..ed01e45 100644
+--- a/common/discover.c
++++ b/common/discover.c
+@@ -635,6 +635,8 @@ discover_interfaces(int state) {
+ 			interface_dereference(&tmp, MDL);
+ 			tmp = interfaces; /* XXX */
+ 		}
++		if (tmp != NULL)
++			get_hw_addr(tmp);
+ 
+ 		if (dhcp_interface_discovery_hook) {
+ 			(*dhcp_interface_discovery_hook)(tmp);
diff --git a/dhcp.spec b/dhcp.spec
index 2ed5753..3f41835 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -16,7 +16,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.6
-Release:  19%{?dist}
+Release:  20%{?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 @@ Patch40:  dhcp-4.3.6-omapi-leak.patch
 Patch41:  dhcp-4.3.6-isc-util.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
@@ -346,8 +347,12 @@ rm bind/bind.tar.gz
 %patch41 -p1 -b .isc-util
 
 ## https://bugzilla.redhat.com/show_bug.cgi?id=1550246
-%patch42 -p1 
-%patch43 -p1
+%patch42 -p1 -b .options-cve
+%patch43 -p1 -b .refcount-cve
+
+# ISC-Bugs #47353
+# https://bugzilla.redhat.com/1163379
+%patch44 -p1 -b .xid-hwaddr
 
 # DHCLIENT_DEFAULT_PREFIX_LEN  64 -> 128
 # https://bugzilla.gnome.org/show_bug.cgi?id=656610
@@ -672,6 +677,9 @@ done
 %endif
 
 %changelog
+* Fri Apr  6 2018 Pavel Zhukov <pzhukov@redhat.com> - 12:4.3.6-20
+- Discover hwaddr for all interfaces for xid uniqueness
+
 * Wed Mar 21 2018 Pavel Zhukov <pzhukov@redhat.com> - 12:4.3.6-19
 - Don't use run-parts for hooks discovery (#1558612)