--- yaboot-1.3.17-rc1/second/file.c     2010-08-05 01:04:46.000000000 -0400
+++ yaboot-1.3.17-rc1-sanedhcppriority/second/file.c    2011-05-31 02:28:30.344814639 -0400
@@ -242,16 +242,14 @@

           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);
                     }
                     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);