Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic of appending ".<layer>" to PXE basename

Browse Source 
Commit f77700aa, which fixes a compiler warning, also breaks the
behaviour of prepending ".<layer>" to basenames in --pxe-service: in
situations where the basename contains a ".", the ".<layer>" suffix is
erroneously added, and in situations where the basename doesn't contain
a ".", the ".<layer>" suffix is erroneously omitted.

A patch against the git HEAD is attached that inverts this logic and
restores the expected behaviour of --pxe-service.
This commit is contained in:
Chris Novakovic
2017-06-06 23:02:59 +01:00
committed by Simon Kelley
parent 109d0e74f1
commit 2446514e71
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rfc2131.c
View File

@@ -836,10 +836,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
if (strchr(service->basename, '.'))
snprintf((char *)mess->file, sizeof(mess->file),
"%s.%d", service->basename, layer);
"%s", service->basename);
else
snprintf((char *)mess->file, sizeof(mess->file),
"%s", service->basename);
"%s.%d", service->basename, layer);
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));