Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/NLNETLABS]: src/external/bsd/nsd/dist 19 March 2019: Wouter



details:   https://anonhg.NetBSD.org/src/rev/d1555573bb51
branches:  NLNETLABS
changeset: 451495:d1555573bb51
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/configlexer.c           |    4 +-
 external/bsd/nsd/dist/configparser.c          |  387 +++++++-------
 external/bsd/nsd/dist/configparser.h          |    8 +-
 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/server.c                |   56 +-
 external/bsd/nsd/dist/udb.h                   |    4 +-
 external/bsd/nsd/dist/zlexer.c                |    4 +-
 external/bsd/nsd/dist/zparser.c               |  647 +++++++++++++------------
 external/bsd/nsd/dist/zparser.h               |    8 +-
 37 files changed, 1165 insertions(+), 585 deletions(-)

diffs (truncated from 4227 to 300 lines):

diff -r 24c024615533 -r d1555573bb51 external/bsd/nsd/dist/Makefile.in
--- a/external/bsd/nsd/dist/Makefile.in Tue Feb 12 15:49:00 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 24c024615533 -r d1555573bb51 external/bsd/nsd/dist/config.h.in
--- a/external/bsd/nsd/dist/config.h.in Tue Feb 12 15:49:00 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 24c024615533 -r d1555573bb51 external/bsd/nsd/dist/configlexer.c
--- a/external/bsd/nsd/dist/configlexer.c       Tue Feb 12 15:49:00 2019 +0000
+++ b/external/bsd/nsd/dist/configlexer.c       Sat May 25 19:44:43 2019 +0000
@@ -3137,10 +3137,10 @@
        YY_BUFFER_STATE b;
        char *buf;
        yy_size_t n;
-       yy_size_t i;
+       int i;
     
        /* Get memory for full buffer, including space for trailing EOB's. */
-       n = (yy_size_t) _yybytes_len + 2;
+       n = (yy_size_t) (_yybytes_len + 2);
        buf = (char *) yyalloc(n  );
        if ( ! buf )
                YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
diff -r 24c024615533 -r d1555573bb51 external/bsd/nsd/dist/configparser.c
--- a/external/bsd/nsd/dist/configparser.c      Tue Feb 12 15:49:00 2019 +0000
+++ b/external/bsd/nsd/dist/configparser.c      Sat May 25 19:44:43 2019 +0000
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 3.0.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.4"
+#define YYBISON_VERSION "3.0.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -1396,6 +1396,7 @@
       case N:                               \
         yyformat = S;                       \
       break
+    default: /* Avoid compiler warnings. */
       YYCASE_(0, YY_("syntax error"));
       YYCASE_(1, YY_("syntax error, unexpected %s"));
       YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -1712,18 +1713,18 @@
   switch (yyn)
     {
         case 10:
-#line 88 "configparser.y" /* yacc.c:1646  */
+#line 88 "configparser.y" /* yacc.c:1648  */
     { OUTYY(("\nP(server:)\n")); 
                if(cfg_parser->server_settings_seen) {
                        yyerror("duplicate server: element.");
                }
                cfg_parser->server_settings_seen = 1;
        }
-#line 1723 "configparser.c" /* yacc.c:1646  */
+#line 1724 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 61:
-#line 112 "configparser.y" /* yacc.c:1646  */
+#line 112 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_ip_address:%s)\n", (yyvsp[0].str))); 
                if(cfg_parser->current_ip_address_option) {
@@ -1744,74 +1745,74 @@
                cfg_parser->current_ip_address_option->address = 
                        region_strdup(cfg_parser->opt->region, (yyvsp[0].str));
        }
-#line 1748 "configparser.c" /* yacc.c:1646  */
+#line 1749 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 62:
-#line 134 "configparser.y" /* yacc.c:1646  */
+#line 134 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); 
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->opt->ip_transparent = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 1759 "configparser.c" /* yacc.c:1646  */
+#line 1760 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 63:
-#line 142 "configparser.y" /* yacc.c:1646  */
+#line 142 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); 
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->opt->ip_freebind = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 1770 "configparser.c" /* yacc.c:1646  */
+#line 1771 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 64:
-#line 150 "configparser.y" /* yacc.c:1646  */
+#line 150 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_debug_mode:%s)\n", (yyvsp[0].str))); 
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->opt->debug_mode = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 1781 "configparser.c" /* yacc.c:1646  */
+#line 1782 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 65:
-#line 158 "configparser.y" /* yacc.c:1646  */
+#line 158 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); 
        }
-#line 1789 "configparser.c" /* yacc.c:1646  */
+#line 1790 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 66:
-#line 163 "configparser.y" /* yacc.c:1646  */
+#line 163 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
                else cfg_parser->opt->verbosity = atoi((yyvsp[0].str));
        }
-#line 1800 "configparser.c" /* yacc.c:1646  */
+#line 1801 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 67:
-#line 171 "configparser.y" /* yacc.c:1646  */
+#line 171 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); 
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->opt->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 1811 "configparser.c" /* yacc.c:1646  */
+#line 1812 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 68:
-#line 179 "configparser.y" /* yacc.c:1646  */
+#line 179 "configparser.y" /* yacc.c:1648  */
     { 
                /* for backwards compatibility in config file with NSD3 */
                OUTYY(("P(server_ip4_only:%s)\n", (yyvsp[0].str))); 
@@ -1822,11 +1823,11 @@
                        cfg_parser->opt->do_ip6 = 0;
                }
        }
-#line 1826 "configparser.c" /* yacc.c:1646  */
+#line 1827 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 69:
-#line 191 "configparser.y" /* yacc.c:1646  */
+#line 191 "configparser.y" /* yacc.c:1648  */
     { 
                /* for backwards compatibility in config file with NSD3 */
                OUTYY(("P(server_ip6_only:%s)\n", (yyvsp[0].str))); 
@@ -1837,44 +1838,44 @@
                        cfg_parser->opt->do_ip4 = 0;
                }
        }
-#line 1841 "configparser.c" /* yacc.c:1646  */
+#line 1842 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 70:
-#line 203 "configparser.y" /* yacc.c:1646  */
+#line 203 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); 
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->opt->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 1852 "configparser.c" /* yacc.c:1646  */
+#line 1853 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 71:
-#line 211 "configparser.y" /* yacc.c:1646  */
+#line 211 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); 
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->opt->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 1863 "configparser.c" /* yacc.c:1646  */
+#line 1864 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 72:
-#line 219 "configparser.y" /* yacc.c:1646  */
+#line 219 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_reuseport:%s)\n", (yyvsp[0].str))); 
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->opt->reuseport = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 1874 "configparser.c" /* yacc.c:1646  */
+#line 1875 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 73:
-#line 227 "configparser.y" /* yacc.c:1646  */
+#line 227 "configparser.y" /* yacc.c:1648  */
     { 
                OUTYY(("P(server_database:%s)\n", (yyvsp[0].str))); 
                cfg_parser->opt->database = region_strdup(cfg_parser->opt->region, (yyvsp[0].str));
@@ -1882,29 +1883,29 @@
                        cfg_parser->opt->zonefiles_write == 0)
                        cfg_parser->opt->zonefiles_write = ZONEFILES_WRITE_INTERVAL;
        }
-#line 1886 "configparser.c" /* yacc.c:1646  */
+#line 1887 "configparser.c" /* yacc.c:1648  */
     break;
 
   case 74:
-#line 236 "configparser.y" /* yacc.c:1646  */
+#line 236 "configparser.y" /* yacc.c:1648  */



Home | Main Index | Thread Index | Old Index