aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGene Cumm <gene.cumm@gmail.com>2015-06-25 11:10:17 -0400
committerGene Cumm <gene.cumm@gmail.com>2015-06-25 11:10:17 -0400
commit8e53b8a63c8ae1e266f63f502a537b9e8e03baed (patch)
tree053dcf43616036bfc3c5c32d128bd369a579f2b8 /core
parent38e861ebf45a804bc5fbd74d9c19292822c84487 (diff)
downloadsyslinux-8e53b8a63c8ae1e266f63f502a537b9e8e03baed.tar.gz
syslinux-8e53b8a63c8ae1e266f63f502a537b9e8e03baed.tar.xz
syslinux-8e53b8a63c8ae1e266f63f502a537b9e8e03baed.zip
core/pxe: Don't prevent serverip override
This prevented a proxyDHCP/PXEReply from overriding the IPInfo.serverip, most often stored in BOOTP field siaddr or DHCP option 54. Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
Diffstat (limited to 'core')
-rw-r--r--core/fs/pxe/dhcp_option.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/fs/pxe/dhcp_option.c b/core/fs/pxe/dhcp_option.c
index c1f4e509..0835cfee 100644
--- a/core/fs/pxe/dhcp_option.c
+++ b/core/fs/pxe/dhcp_option.c
@@ -72,9 +72,6 @@ static void server(const void *data, int opt_len)
if (opt_len != 4)
return;
- if (IPInfo.serverip)
- return;
-
ip = *(uint32_t *)data;
if (ip_ok(ip))
IPInfo.serverip = ip;