[syslinux:master] core/pxe: Don't prevent serverip override
syslinux-bot for Gene Cumm
gene.cumm at gmail.com
Thu Jun 25 18:18:04 PDT 2015
Commit-ID: 8e53b8a63c8ae1e266f63f502a537b9e8e03baed
Gitweb: http://www.syslinux.org/commit/8e53b8a63c8ae1e266f63f502a537b9e8e03baed
Author: Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Thu, 25 Jun 2015 11:10:17 -0400
Committer: Gene Cumm <gene.cumm at gmail.com>
CommitDate: Thu, 25 Jun 2015 11:10:17 -0400
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 at gmail.com>
---
core/fs/pxe/dhcp_option.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/core/fs/pxe/dhcp_option.c b/core/fs/pxe/dhcp_option.c
index c1f4e50..0835cfe 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;
More information about the Syslinux-commits
mailing list