From 8e53b8a63c8ae1e266f63f502a537b9e8e03baed Mon Sep 17 00:00:00 2001 From: Gene Cumm Date: Thu, 25 Jun 2015 11:10:17 -0400 Subject: 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 --- core/fs/pxe/dhcp_option.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'core') 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; -- cgit v1.2.3