From 4b276b8df9de6909c3f3ac7034d6a97454d466d5 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 3 Feb 2009 02:44:15 +0000 Subject: [PATCH] [pxe] Fall back to broadcast if no boot server multicast address exists fetch_ipv4_setting() will zero its IPv4 address argument if no such setting exists, rather than leaving it untouched. --- src/usr/pxemenu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/usr/pxemenu.c b/src/usr/pxemenu.c index 3f5bfc88..ae971088 100644 --- a/src/usr/pxemenu.c +++ b/src/usr/pxemenu.c @@ -95,8 +95,9 @@ static int pxe_menu_parse ( struct pxe_menu **menu ) { /* Fetch relevant settings */ tmp_setting.tag = DHCP_PXE_BOOT_SERVER_MCAST; - server.s_addr = INADDR_BROADCAST; fetch_ipv4_setting ( NULL, &tmp_setting, &server ); + if ( ! server.s_addr ) + server.s_addr = INADDR_BROADCAST; tmp_setting.tag = DHCP_PXE_BOOT_MENU_PROMPT; fetch_setting ( NULL, &tmp_setting, &prompt, sizeof ( prompt ) ); tmp_setting.tag = DHCP_PXE_BOOT_MENU;