From 64466daebf52c8454b953fcf3d4823db81b2f368 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 26 May 2010 19:07:16 +0000
Subject: [PATCH] -Fix DHCP vs. env priority (proper would be to treat
 '000.000.000.000' as invalid equal to a blank string or null pointer)

Former-commit-id: ac76f5164f1f046a882c6f1e17183349ed1ed116
---
 ...oot-1.3.15-05122010-sanedhcppriority.patch | 22 +++++++++++++++++++
 yaboot/yaboot-xcat.spec                       |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 yaboot/yaboot-1.3.15-05122010-sanedhcppriority.patch

diff --git a/yaboot/yaboot-1.3.15-05122010-sanedhcppriority.patch b/yaboot/yaboot-1.3.15-05122010-sanedhcppriority.patch
new file mode 100644
index 0000000..96c4f53
--- /dev/null
+++ b/yaboot/yaboot-1.3.15-05122010-sanedhcppriority.patch
@@ -0,0 +1,22 @@
+diff -urN yaboot-1.3.15-05122010/second/file.c yaboot-1.3.15-05122010-sanedhcppriority//second/file.c
+--- yaboot-1.3.15-05122010/second/file.c	2010-05-26 18:50:03.000000000 -0400
++++ yaboot-1.3.15-05122010-sanedhcppriority//second/file.c	2010-05-26 18:51:10.000000000 -0400
+@@ -237,7 +237,7 @@
+ 
+           switch (tag) {
+                case DHCP_NETMASK:
+-                    if ((result->subnetmask == NULL || *(result->subnetmask) == '\x0') && value != 0) {
++                    if (value != 0) {
+                          result->subnetmask = ipv4_to_str(value);
+                          DEBUG_F("Storing %s as subnetmask from options\n",
+                                  result->subnetmask);
+@@ -245,8 +245,7 @@
+                     /* FIXME: do we need to grok the subnet mask? */
+                     break;
+                case DHCP_ROUTERS:
+-                    if ((result->giaddr == NULL || *(result->giaddr) == '\x0')
+-                        && value != 0) {
++                    if (value != 0) {
+                          result->giaddr = ipv4_to_str(value);
+                          DEBUG_F("Storing %s as gateway from options\n",
+                                  result->giaddr);
diff --git a/yaboot/yaboot-xcat.spec b/yaboot/yaboot-xcat.spec
index a715baa..7806e5a 100644
--- a/yaboot/yaboot-xcat.spec
+++ b/yaboot/yaboot-xcat.spec
@@ -5,7 +5,7 @@ Summary: yaboot binary for tftp server
 %define _binary_payload w9.bzdio
 Name: %{pkg}
 Version: %{ver}
-Release: 05172010
+Release: 05262010
 Group: System/Administration
 License: GPL2
 URL: http://yaboot.ozlabs.org/
@@ -17,6 +17,7 @@ Patch3: yaboot-1.3.14-better_netboot.patch
 Patch4: yaboot-1.3.14-ipv6.patch
 Patch5: yaboot-1.3.14-move_kernel.patch
 Patch6: yaboot-1.3.14-better_netboot2.patch
+Patch7: yaboot-1.3.15-05122010-sanedhcppriority.patch
 BuildRoot: %{_tmppath}/%{pkg}-buildroot
 Prefix: %{_prefix}
 BuildArch: noarch
@@ -36,6 +37,7 @@ ppc nodes.
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
+%patch7 -p1
 
 
 %build