mirror of
https://github.com/xcat2/xcat-dep.git
synced 2024-11-24 10:29:53 +00:00
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
|
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);
|