mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Fix up pxelogic.0 suffix logic.
Regression in v2.77 caused by a patch proposed by yours truly. Reported by: Steven Shiau (via upstream dnsmasq-discuss mailing list) Obtained from: Chris Novakovich and Simon Kelley Pointyhat to: mandree@
This commit is contained in:
parent
6419342b27
commit
6a565e29e5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=442888
2 changed files with 31 additions and 1 deletions
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
PORTNAME= dnsmasq
|
PORTNAME= dnsmasq
|
||||||
DISTVERSION= 2.77
|
DISTVERSION= 2.77
|
||||||
PORTREVISION= 0 # leave this in even if 0 to avoid PORTEPOCH bumps
|
PORTREVISION= 1 # leave this in even if 0 to avoid PORTEPOCH bumps
|
||||||
PORTEPOCH= 1
|
PORTEPOCH= 1
|
||||||
CATEGORIES= dns ipv6
|
CATEGORIES= dns ipv6
|
||||||
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \
|
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \
|
||||||
|
|
30
dns/dnsmasq/files/patch-src_rfc2131.c
Normal file
30
dns/dnsmasq/files/patch-src_rfc2131.c
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
commit 2446514e716075cfe2be35e2a9b9de4eacdbac99
|
||||||
|
Author: Chris Novakovic <chris@chrisn.me.uk>
|
||||||
|
Date: Tue Jun 6 23:02:59 2017 +0100
|
||||||
|
|
||||||
|
Fix logic of appending ".<layer>" to PXE basename
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
--- src/rfc2131.c.orig 2017-05-22 21:58:46 UTC
|
||||||
|
+++ src/rfc2131.c
|
||||||
|
@@ -836,10 +836,10 @@ size_t dhcp_reply(struct dhcp_context *c
|
||||||
|
|
||||||
|
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));
|
Loading…
Add table
Reference in a new issue