Date: Wed, 29 Jun 2011 13:01:10 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/contrib/ntp/ntpd ntp_config.c ntp_intres.c Message-ID: <201106291301.p5TD1NEk048666@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
bz 2011-06-29 13:01:10 UTC
FreeBSD src repository
Modified files:
contrib/ntp/ntpd ntp_config.c ntp_intres.c
Log:
SVN rev 223667 on 2011-06-29 13:01:10Z by bz
In case ntp cannot resolve a hostname on startup it will queue the entry
for resolving by a child process that, upon success, will add the entry
to the config of the running running parent process.
Unfortunately there are a couple of bugs with this, fixed in various
later versions of upstream in potentially different ways due to other
code changes:
1) Upon server [-46] <FQDN> the [-46] are used as FQDN for later resolving
which does not work. Make sure we always pass the name (or IP there).
2) The intermediate file to carry the information to the child process
does not know about -4/-6 restrictions, so that a dual-stacked host
could resolve to an IPv6 address but that might be unreachable (see
r223626) leading to no working synchronization ignoring a IPv4 record.
Thus alter the intermediate format to also pass the address family
(AF_UNSPEC (default), AF_INET or AF_INET6) to the child process
depending on -4 or -6.
3) Make the child process to parse the new intermediate file format and
save the address family for getaddrinfo() hints flags.
4) Change child to always reload resolv.conf calling res_init() before
trying to resolve names. This will pick up resolv.conf changes or
new resolv.confs should they have not existed or been empty or
unusable on ntp startup. This fix is more conditional in upstream
versions but given FreeBSD has res_init there is no need for the
configure logic as well.
Approved by: roberto
Sponsored by: Sandvine Incorporated
MFC after: 9 days
Revision Changes Path
1.3 +7 -6 src/contrib/ntp/ntpd/ntp_config.c
1.4 +29 -14 src/contrib/ntp/ntpd/ntp_intres.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106291301.p5TD1NEk048666>