From f178436bb1be3cb312e9904da89ab42ccb3a976b Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 2 Aug 2008 03:03:42 +0100 Subject: [PATCH] [pxe] If no ProxyDHCPACK exists, use DHCPACK for the fake ProxyDHCPACK packet WinPE seems to have a bug that causes it to always use the TFTP server IP address and filename from the ProxyDHCPACK packet, even if the ProxyDHCPACK packet doesn't exist. This causes it to end up attempting to fetch a file such as tftp://0.0.0.0/bootmgr.exe If we don't have a ProxyDHCPACK to use, we pretend that it was a copy of the DHCPACK packet. This works around the problem, and hopefully won't surprise any NBPs. --- src/net/fakedhcp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/net/fakedhcp.c b/src/net/fakedhcp.c index a10e442b..60264756 100644 --- a/src/net/fakedhcp.c +++ b/src/net/fakedhcp.c @@ -181,11 +181,9 @@ int create_fakeproxydhcpack ( struct net_device *netdev, /* Identify ProxyDHCP settings */ settings = find_settings ( PROXYDHCP_SETTINGS_NAME ); - /* No ProxyDHCP settings => return empty block */ - if ( ! settings ) { - memset ( data, 0, max_len ); - return 0; - } + /* No ProxyDHCP settings => use normal DHCPACK */ + if ( ! settings ) + return create_fakedhcpack ( netdev, data, max_len ); /* Create base DHCPACK packet */ if ( ( rc = dhcp_create_packet ( &dhcppkt, netdev, DHCPACK, NULL,