Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/nsd/dist 19 March 2019: Wouter
details: https://anonhg.NetBSD.org/src/rev/f48149654aab
branches: trunk
changeset: 841608:f48149654aab
user: christos <christos%NetBSD.org@localhost>
date: Sat May 25 19:44:43 2019 +0000
description:
19 March 2019: Wouter
- tag 4.1.27rc1
18 March 2019: Wouter
- Fix unit test bug013_truncate for new truncation with EDNS size,
it is one RR smaller for the truncated response in the test.
14 March 2019: Wouter
- Fixed radtree_insert memory leak.
- Fixed access recycled variable.
11 March 2019: Wouter
- Fix #6: nsd-control-setup: Change validity time to a shorter
period (<2038).
- Fix unused definition in header remote.h.
- Fix #4236: IPV4_MINIMAL_RESPONSE_SIZE=1480 is slightly too big.
- Fix #4235: IP_PMTUDISC_OMIT on IPv4/UDP sockets.
18 February 2019: Wouter
- Fix to remove unused code.
15 February 2019: Wouter
- tentative robustness, delete stats items from list twice if needed.
14 February 2019: Wouter
- Fix #4: setusercontext() is in libutil on NetBSD, and also
include login_cap.h only if it exists.
- Fix #4215: fixup for state update for TSIG information in server
processes, nicer printout for tsig_print, tsig_print without
arguments and no leaks.
- nicer logging for update_tsig.
1 February 2019: Wouter
- Fix for tsig assoc_tsig command on acl with nokey elements.
29 January 2019: Wouter
- Fix #4215: on-the-fly change of TSIG keys with patch from Igor, adds
nsd-control print_tsig, update_tsig, add_tsig, assoc_tsig
and del_tsig. These changes are gone after reload, edit the
config file (or a file included from it) to make changes that
last after restart.
- documentation for tsig nsd-control options.
24 January 2019: Wouter
- Deny ANY with only one RR in response, by default. Patch from
Daisuke Higashi. The deny-any statement in nsd.conf sets ANY
queries over UDP to be further moved to TCP as well.
Also no additional section processig for type ANY, reducing
the response size.
- assertions for clang analysis.
10 December 2018: Wouter
- Fix for FreeBSD port with dnstap enabled.
6 December 2018: Wouter
- Fix to reduce region_log_stats if condition, this removes a
debug statement.
5 December 2018: Wouter
- Fix #4213: disable-ipv6 and dnstap compile error.
3 December 2018: Wouter
- Note that the content_list member is unused; and could be removed
if the database format is modified or updated.
- Fix that dnstap logs CQ and CR like BIND does.
- Revert that, it looks wrong, AQ and AR are for the authoritative.
diffstat:
external/bsd/nsd/dist/Makefile.in | 13 +-
external/bsd/nsd/dist/config.h.in | 3 +
external/bsd/nsd/dist/configure | 85 ++++++-
external/bsd/nsd/dist/configure.ac | 3 +-
external/bsd/nsd/dist/difffile.c | 1 +
external/bsd/nsd/dist/dnstap/dnstap.c | 2 +-
external/bsd/nsd/dist/doc/ChangeLog | 73 +++++-
external/bsd/nsd/dist/doc/README | 10 +-
external/bsd/nsd/dist/doc/RELNOTES | 28 ++
external/bsd/nsd/dist/doc/REQUIREMENTS | 6 +-
external/bsd/nsd/dist/doc/TODO | 2 +-
external/bsd/nsd/dist/doc/differences.tex | 2 +-
external/bsd/nsd/dist/mkinstalldirs | 2 +-
external/bsd/nsd/dist/namedb.c | 5 +-
external/bsd/nsd/dist/nsd-checkconf.8.in | 2 +-
external/bsd/nsd/dist/nsd-checkzone.8.in | 2 +-
external/bsd/nsd/dist/nsd-control-setup.sh.in | 2 +-
external/bsd/nsd/dist/nsd-control.8.in | 27 ++-
external/bsd/nsd/dist/nsd-control.c | 5 +
external/bsd/nsd/dist/nsd.8.in | 4 +-
external/bsd/nsd/dist/nsd.c | 4 +-
external/bsd/nsd/dist/nsd.conf.5.in | 2 +-
external/bsd/nsd/dist/options.h | 2 +
external/bsd/nsd/dist/packet.h | 2 +-
external/bsd/nsd/dist/query.c | 12 +-
external/bsd/nsd/dist/radtree.c | 5 +-
external/bsd/nsd/dist/region-allocator.c | 4 +-
external/bsd/nsd/dist/remote.c | 323 +++++++++++++++++++++++++-
external/bsd/nsd/dist/remote.h | 1 -
external/bsd/nsd/dist/udb.h | 4 +-
30 files changed, 586 insertions(+), 50 deletions(-)
diffs (truncated from 1104 to 300 lines):
diff -r 3d525efa4238 -r f48149654aab external/bsd/nsd/dist/Makefile.in
--- a/external/bsd/nsd/dist/Makefile.in Sat May 25 19:21:34 2019 +0000
+++ b/external/bsd/nsd/dist/Makefile.in Sat May 25 19:44:43 2019 +0000
@@ -308,7 +308,7 @@
$(YACC) -d -o configparser.c $(srcdir)/configparser.y
# dnstap
-dnstap.o: $(srcdir)/dnstap/dnstap.c config.h \
+dnstap.o: $(srcdir)/dnstap/dnstap.c config.h dnstap/dnstap_config.h \
dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h $(srcdir)/dnstap/dnstap.h \
$(srcdir)/util.h $(srcdir)/options.h $(srcdir)/rbtree.h \
$(srcdir)/region-allocator.h
@@ -345,6 +345,9 @@
-e 's?$$(srcdir)/configlexer.c?configlexer.c?g' \
-e 's?$$(srcdir)/configparser.c?configparser.c?g' \
-e 's?$$(srcdir)/configparser.h?configparser.h?g' \
+ -e 's?$$(srcdir)/dnstap/dnstap_config.h??g' \
+ -e 's?$$(srcdir)/dnstap/dnstap.pb-c.c?dnstap/dnstap.pb-c.c?g' \
+ -e 's?$$(srcdir)/dnstap/dnstap.pb-c.h?dnstap/dnstap.pb-c.h?g' \
-e 's?$$(srcdir)/zlexer.c?zlexer.c?g' \
-e 's?$$(srcdir)/zparser.c?zparser.c?g' \
-e 's?$$(srcdir)/zparser.h?zparser.h?g' \
@@ -401,7 +404,8 @@
$(srcdir)/util.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/nsec3.h
netio.o: $(srcdir)/netio.c config.h $(srcdir)/netio.h $(srcdir)/region-allocator.h $(srcdir)/util.h
nsd.o: $(srcdir)/nsd.c config.h $(srcdir)/nsd.h $(srcdir)/dns.h $(srcdir)/edns.h $(srcdir)/buffer.h $(srcdir)/region-allocator.h \
- $(srcdir)/util.h $(srcdir)/options.h $(srcdir)/rbtree.h $(srcdir)/tsig.h $(srcdir)/dname.h $(srcdir)/remote.h $(srcdir)/xfrd-disk.h
+ $(srcdir)/util.h $(srcdir)/options.h $(srcdir)/rbtree.h $(srcdir)/tsig.h $(srcdir)/dname.h $(srcdir)/remote.h $(srcdir)/xfrd-disk.h \
+ $(srcdir)/dnstap/dnstap_collector.h
nsd-checkconf.o: $(srcdir)/nsd-checkconf.c config.h $(srcdir)/tsig.h $(srcdir)/buffer.h \
$(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/dname.h $(srcdir)/options.h $(srcdir)/rbtree.h $(srcdir)/rrl.h $(srcdir)/query.h \
$(srcdir)/namedb.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/packet.h
@@ -440,7 +444,8 @@
server.o: $(srcdir)/server.c config.h $(srcdir)/axfr.h $(srcdir)/nsd.h $(srcdir)/dns.h $(srcdir)/edns.h $(srcdir)/buffer.h \
$(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/query.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/radtree.h $(srcdir)/rbtree.h \
$(srcdir)/packet.h $(srcdir)/tsig.h $(srcdir)/netio.h $(srcdir)/xfrd.h $(srcdir)/options.h $(srcdir)/xfrd-tcp.h $(srcdir)/xfrd-disk.h \
- $(srcdir)/difffile.h $(srcdir)/udb.h $(srcdir)/nsec3.h $(srcdir)/ipc.h $(srcdir)/remote.h $(srcdir)/lookup3.h $(srcdir)/rrl.h
+ $(srcdir)/difffile.h $(srcdir)/udb.h $(srcdir)/nsec3.h $(srcdir)/ipc.h $(srcdir)/remote.h $(srcdir)/lookup3.h $(srcdir)/rrl.h \
+ $(srcdir)/dnstap/dnstap_collector.h
tsig.o: $(srcdir)/tsig.c config.h $(srcdir)/tsig.h $(srcdir)/buffer.h $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/dname.h \
$(srcdir)/tsig-openssl.h $(srcdir)/dns.h $(srcdir)/packet.h $(srcdir)/namedb.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/query.h $(srcdir)/nsd.h \
$(srcdir)/edns.h
@@ -456,7 +461,7 @@
xfrd.o: $(srcdir)/xfrd.c config.h $(srcdir)/xfrd.h $(srcdir)/rbtree.h $(srcdir)/region-allocator.h $(srcdir)/namedb.h \
$(srcdir)/dname.h $(srcdir)/buffer.h $(srcdir)/util.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/options.h $(srcdir)/tsig.h $(srcdir)/xfrd-tcp.h \
$(srcdir)/xfrd-disk.h $(srcdir)/xfrd-notify.h $(srcdir)/netio.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/packet.h $(srcdir)/rdata.h \
- $(srcdir)/difffile.h $(srcdir)/udb.h $(srcdir)/ipc.h $(srcdir)/remote.h $(srcdir)/rrl.h $(srcdir)/query.h
+ $(srcdir)/difffile.h $(srcdir)/udb.h $(srcdir)/ipc.h $(srcdir)/remote.h $(srcdir)/rrl.h $(srcdir)/query.h $(srcdir)/dnstap/dnstap_collector.h
xfrd-disk.o: $(srcdir)/xfrd-disk.c config.h $(srcdir)/xfrd-disk.h $(srcdir)/xfrd.h $(srcdir)/rbtree.h \
$(srcdir)/region-allocator.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h $(srcdir)/util.h $(srcdir)/dns.h $(srcdir)/radtree.h \
$(srcdir)/options.h $(srcdir)/tsig.h $(srcdir)/nsd.h $(srcdir)/edns.h
diff -r 3d525efa4238 -r f48149654aab external/bsd/nsd/dist/config.h.in
--- a/external/bsd/nsd/dist/config.h.in Sat May 25 19:21:34 2019 +0000
+++ b/external/bsd/nsd/dist/config.h.in Sat May 25 19:44:43 2019 +0000
@@ -178,6 +178,9 @@
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
+/* Define to 1 if you have the <login_cap.h> header file. */
+#undef HAVE_LOGIN_CAP_H
+
/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */
#undef HAVE_MALLOC
diff -r 3d525efa4238 -r f48149654aab external/bsd/nsd/dist/configure
--- a/external/bsd/nsd/dist/configure Sat May 25 19:21:34 2019 +0000
+++ b/external/bsd/nsd/dist/configure Sat May 25 19:44:43 2019 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NSD 4.1.26.
+# Generated by GNU Autoconf 2.69 for NSD 4.1.27.
#
# Report bugs to <nsd-bugs%nlnetlabs.nl@localhost>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='NSD'
PACKAGE_TARNAME='nsd'
-PACKAGE_VERSION='4.1.26'
-PACKAGE_STRING='NSD 4.1.26'
+PACKAGE_VERSION='4.1.27'
+PACKAGE_STRING='NSD 4.1.27'
PACKAGE_BUGREPORT='nsd-bugs%nlnetlabs.nl@localhost'
PACKAGE_URL=''
@@ -1296,7 +1296,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures NSD 4.1.26 to adapt to many kinds of systems.
+\`configure' configures NSD 4.1.27 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1357,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NSD 4.1.26:";;
+ short | recursive ) echo "Configuration of NSD 4.1.27:";;
esac
cat <<\_ACEOF
@@ -1512,7 +1512,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NSD configure 4.1.26
+NSD configure 4.1.27
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2221,7 +2221,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by NSD $as_me 4.1.26, which was
+It was created by NSD $as_me 4.1.27, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8025,6 +8025,73 @@
fi
done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setusercontext" >&5
+$as_echo_n "checking for library containing setusercontext... " >&6; }
+if ${ac_cv_search_setusercontext+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char setusercontext ();
+int
+main ()
+{
+return setusercontext ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' util; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_setusercontext=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_setusercontext+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_setusercontext+:} false; then :
+
+else
+ ac_cv_search_setusercontext=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_setusercontext" >&5
+$as_echo "$ac_cv_search_setusercontext" >&6; }
+ac_res=$ac_cv_search_setusercontext
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ for ac_header in login_cap.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "login_cap.h" "ac_cv_header_login_cap_h" "$ac_includes_default"
+if test "x$ac_cv_header_login_cap_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LOGIN_CAP_H 1
+_ACEOF
+
+fi
+
+done
+
+fi
+
for ac_func in tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror
sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -10072,7 +10139,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by NSD $as_me 4.1.26, which was
+This file was extended by NSD $as_me 4.1.27, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10134,7 +10201,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-NSD config.status 4.1.26
+NSD config.status 4.1.27
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -r 3d525efa4238 -r f48149654aab external/bsd/nsd/dist/configure.ac
--- a/external/bsd/nsd/dist/configure.ac Sat May 25 19:21:34 2019 +0000
+++ b/external/bsd/nsd/dist/configure.ac Sat May 25 19:44:43 2019 +0000
@@ -5,7 +5,7 @@
sinclude(acx_nlnetlabs.m4)
sinclude(dnstap/dnstap.m4)
-AC_INIT(NSD,4.1.26,nsd-bugs%nlnetlabs.nl@localhost)
+AC_INIT(NSD,4.1.27,nsd-bugs%nlnetlabs.nl@localhost)
AC_CONFIG_HEADER([config.h])
CFLAGS="$CFLAGS"
@@ -627,6 +627,7 @@
AC_CHECK_SIZEOF(void*)
AC_CHECK_SIZEOF(off_t)
AC_CHECK_FUNCS([arc4random arc4random_uniform])
+AC_SEARCH_LIBS([setusercontext],[util],[AC_CHECK_HEADERS([login_cap.h])])
AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror
sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4])
AC_ARG_ENABLE(recvmmsg, AC_HELP_STRING([--enable-recvmmsg], [Enable recvmmsg and sendmmsg compilation, faster but some kernel versions may have implementation problems for IPv6]))
diff -r 3d525efa4238 -r f48149654aab external/bsd/nsd/dist/difffile.c
--- a/external/bsd/nsd/dist/difffile.c Sat May 25 19:21:34 2019 +0000
+++ b/external/bsd/nsd/dist/difffile.c Sat May 25 19:44:43 2019 +0000
@@ -1381,6 +1381,7 @@
#endif /* NSEC3 */
zonedb->is_changed = 1;
if(nsd->db->udb) {
+ assert(z.base);
ZONE(&z)->is_changed = 1;
ZONE(&z)->mtime = time_end_0;
ZONE(&z)->mtime_nsec = time_end_1*1000;
diff -r 3d525efa4238 -r f48149654aab external/bsd/nsd/dist/dnstap/dnstap.c
--- a/external/bsd/nsd/dist/dnstap/dnstap.c Sat May 25 19:21:34 2019 +0000
+++ b/external/bsd/nsd/dist/dnstap/dnstap.c Sat May 25 19:44:43 2019 +0000
@@ -319,7 +319,7 @@
*has_port = 1;
} else if (ss->ss_family == AF_INET) {
#else
- if (ss->ss_family == AF_INET) {
+ if (ss->sin_family == AF_INET) {
#endif /* INET6 */
struct sockaddr_in *s = (struct sockaddr_in *) ss;
diff -r 3d525efa4238 -r f48149654aab external/bsd/nsd/dist/doc/ChangeLog
--- a/external/bsd/nsd/dist/doc/ChangeLog Sat May 25 19:21:34 2019 +0000
+++ b/external/bsd/nsd/dist/doc/ChangeLog Sat May 25 19:44:43 2019 +0000
@@ -1,5 +1,76 @@
+19 March 2019: Wouter
+ - tag 4.1.27rc1
+
+18 March 2019: Wouter
+ - Fix unit test bug013_truncate for new truncation with EDNS size,
+ it is one RR smaller for the truncated response in the test.
+
+14 March 2019: Wouter
+ - Fixed radtree_insert memory leak.
+ - Fixed access recycled variable.
+
+11 March 2019: Wouter
+ - Fix #6: nsd-control-setup: Change validity time to a shorter
+ period (<2038).
+ - Fix unused definition in header remote.h.
+ - Fix #4236: IPV4_MINIMAL_RESPONSE_SIZE=1480 is slightly too big.
+ - Fix #4235: IP_PMTUDISC_OMIT on IPv4/UDP sockets.
+
+18 February 2019: Wouter
+ - Fix to remove unused code.
+
+15 February 2019: Wouter
+ - tentative robustness, delete stats items from list twice if needed.
+
+14 February 2019: Wouter
+ - Fix #4: setusercontext() is in libutil on NetBSD, and also
+ include login_cap.h only if it exists.
+ - Fix #4215: fixup for state update for TSIG information in server
+ processes, nicer printout for tsig_print, tsig_print without
+ arguments and no leaks.
+ - nicer logging for update_tsig.
+
+1 February 2019: Wouter
+ - Fix for tsig assoc_tsig command on acl with nokey elements.
+
+29 January 2019: Wouter
+ - Fix #4215: on-the-fly change of TSIG keys with patch from Igor, adds
+ nsd-control print_tsig, update_tsig, add_tsig, assoc_tsig
+ and del_tsig. These changes are gone after reload, edit the
Home |
Main Index |
Thread Index |
Old Index