From 41bd905ea6dc3c1316484bf49b2fafddf78471ef Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Feb 17 2014 16:59:25 +0000
Subject: comment out sending of client-id in dhclient.conf (#60361#c42)


---

diff --git a/dhcp.spec b/dhcp.spec
index 78e2015..52a0bda 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.6
-Release:  2%{?dist}
+Release:  3%{?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.
@@ -489,12 +489,10 @@ EOF
 # Send client identifier as "hardware-type.link-layer address" (e.g. "1.c2.23.7d.c3.52.2c")
 # Required in environments where a bridge might be clobbering the forwarded
 # packet's MAC address (common in Wifi, Docsis, or ADSL bridging scenarios)
-# Exclude InfiniBand (32) which is special case (RFC 4390).
+# Does not work with InfiniBand, which is special case (RFC 4390).
 # see dhcp-options(5) man page for 'dhcp-client-identifier'
 # see dhcp-eval(5) man page for 'hardware'
-if not hardware = 32 {
-    send dhcp-client-identifier = hardware;
-}
+# send dhcp-client-identifier = hardware;
 EOF
 
 # Install dhcp.schema for LDAP configuration
@@ -631,6 +629,9 @@ done
 
 
 %changelog
+* Mon Feb 17 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.6-3
+- comment out sending of client-id in dhclient.conf (#60361#c42)
+
 * Fri Feb 14 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.6-2
 - dhclient.conf: don't create client-id if InfiniBand (#560361#c38)