]> git.ipfire.org Git - people/jschlag/ipfire-2.x.git/commit
dnsmasq: 2.76test10 with latest patch (005) and some fixes
authorMatthias Fischer <matthias.fischer@ipfire.org>
Sat, 27 Feb 2016 15:29:45 +0000 (16:29 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Feb 2016 20:15:18 +0000 (12:15 -0800)
commita6cd8b9b5d903da27fef106329c892e372753e5f
tree761542797428ab421376f13620a3185054d8f049
parent3b9815eb87e83a1b24e85ce0eab14a962b62ccd0
dnsmasq: 2.76test10 with latest patch (005) and some fixes

1. Added patch 005 because of the discussion on the dnsmasq-list:
"I've noticed that replies which get their TTL from the dhcp-ttl
option always get the TTL specified in dhcp-ttl. I'd prefer
something like max(0, min(<dhcp-ttl>, <lease-expire-time> -
<now>)). Otherwise, dns might hand out a high TTL for a dhcp-lease
which expires one second later.
...
Seems a sensible addition.

Cheers,

Simon."

2. Fixed several line numbers and patch lines in
'dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch'. On the last build
I got some "Hunk failed" messages. Patches are now applied exactly at the
given lines.

3. Nevertheless, I still get some warnings:
...
dnsmasq.c: In function 'main':
dnsmasq.c:55:7: warning: unused variable 'did_bind' [-Wunused-variable]
   int did_bind = 0;
       ^
dnsmasq.c:54:9: warning: unused variable 'bound_device' [-Wunused-variable]
   char *bound_device = NULL;
         ^
...
isc.c: In function 'dhcp_lease_new':
isc.c:40:3: warning: ignoring return value of 'asprintf', declared with attribute warn_unused_result [-Wunused-result]
   asprintf(&lease->fqdn, "%s.%s", hostname, daemon->domain_suffix);
   ^

Asking about these warnings in the dnsmasq-list showed no reaction - no one answered.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/dnsmasq
src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
src/patches/dnsmasq/005-Apply_ceiling_of_lease_length_to_TTL_when_--dhcp-ttl_in_use.patch [new file with mode: 0644]