Source-Changes-HG archive

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

[src/netbsd-8]: src/external/bsd/nsd Sync with current, requested by hannken ...



details:   https://anonhg.NetBSD.org/src/rev/43a06cba0643
branches:  netbsd-8
changeset: 435309:43a06cba0643
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Oct 13 17:30:00 2018 +0000

description:
Sync with current, requested by hannken in ticket #1060:

        external/bsd/nsd/dist/contrib/nsd.service       up to 1.1.1.1
        external/bsd/nsd/dist/contrib/nsd.socket        up to 1.1.1.1
        external/bsd/nsd/dist/xfr-inspect.c             up to 1.1.1.2
        external/bsd/nsd/dist/systemd.m4                up to 1.1.1.1
        external/bsd/nsd/Makefile.inc                   up to 1.5
        external/bsd/nsd/dist/Makefile.in               up to 1.1.1.3
        external/bsd/nsd/dist/axfr.c                    up to 1.1.1.2
        external/bsd/nsd/dist/config.h.in               up to 1.1.1.3
        external/bsd/nsd/dist/configlexer.c             up to 1.3
        external/bsd/nsd/dist/configlexer.lex           up to 1.1.1.3
        external/bsd/nsd/dist/configparser.c            up to 1.3
        external/bsd/nsd/dist/configparser.h            up to 1.3
        external/bsd/nsd/dist/configparser.y            up to 1.1.1.3
        external/bsd/nsd/dist/configure                 up to 1.1.1.3
        external/bsd/nsd/dist/configure.ac              up to 1.1.1.3
        external/bsd/nsd/dist/dbaccess.c                up to 1.1.1.2
        external/bsd/nsd/dist/dbcreate.c                up to 1.1.1.3
        external/bsd/nsd/dist/difffile.c                up to 1.1.1.3
        external/bsd/nsd/dist/difffile.h                up to 1.1.1.2
        external/bsd/nsd/dist/dns.c                     up to 1.1.1.3
        external/bsd/nsd/dist/dns.h                     up to 1.1.1.3
        external/bsd/nsd/dist/ipc.c                     up to 1.1.1.3
        external/bsd/nsd/dist/lookup3.c                 up to 1.1.1.2
        external/bsd/nsd/dist/mini_event.c              up to 1.1.1.2
        external/bsd/nsd/dist/mini_event.h              up to 1.1.1.2
        external/bsd/nsd/dist/namedb.c                  up to 1.1.1.3
        external/bsd/nsd/dist/namedb.h                  up to 1.1.1.2
        external/bsd/nsd/dist/netio.c                   up to 1.1.1.2
        external/bsd/nsd/dist/nsd-checkconf.8.in        up to 1.1.1.3
        external/bsd/nsd/dist/nsd-checkconf.c           up to 1.1.1.3
        external/bsd/nsd/dist/nsd-checkzone.8.in        up to 1.1.1.3
        external/bsd/nsd/dist/nsd-checkzone.c           up to 1.1.1.2
        external/bsd/nsd/dist/nsd-control.8.in          up to 1.1.1.3
        external/bsd/nsd/dist/nsd-control.c             up to 1.1.1.3
        external/bsd/nsd/dist/nsd-mem.c                 up to 1.1.1.3
        external/bsd/nsd/dist/nsd.8.in                  up to 1.1.1.3
        external/bsd/nsd/dist/nsd.c                     up to 1.1.1.3
        external/bsd/nsd/dist/nsd.conf.5.in             up to 1.1.1.3
        external/bsd/nsd/dist/nsd.conf.sample.in        up to 1.1.1.3
        external/bsd/nsd/dist/nsd.h                     up to 1.1.1.3
        external/bsd/nsd/dist/nsec3.c                   up to 1.1.1.3
        external/bsd/nsd/dist/nsec3.h                   up to 1.1.1.2
        external/bsd/nsd/dist/options.c                 up to 1.1.1.3
        external/bsd/nsd/dist/options.h                 up to 1.1.1.3
        external/bsd/nsd/dist/packet.c                  up to 1.1.1.2
        external/bsd/nsd/dist/packet.h                  up to 1.1.1.2
        external/bsd/nsd/dist/query.c                   up to 1.1.1.3
        external/bsd/nsd/dist/query.h                   up to 1.1.1.2
        external/bsd/nsd/dist/radtree.c                 up to 1.1.1.2
        external/bsd/nsd/dist/radtree.h                 up to 1.1.1.2
        external/bsd/nsd/dist/rbtree.c                  up to 1.1.1.2
        external/bsd/nsd/dist/rbtree.h                  up to 1.1.1.2
        external/bsd/nsd/dist/rdata.c                   up to 1.1.1.2
        external/bsd/nsd/dist/region-allocator.c        up to 1.1.1.2
        external/bsd/nsd/dist/remote.c                  up to 1.1.1.3
        external/bsd/nsd/dist/remote.h                  up to 1.1.1.2
        external/bsd/nsd/dist/rrl.c                     up to 1.1.1.3
        external/bsd/nsd/dist/rrl.h                     up to 1.1.1.2
        external/bsd/nsd/dist/server.c                  up to 1.1.1.3
        external/bsd/nsd/dist/tsig.c                    up to 1.1.1.3
        external/bsd/nsd/dist/udb.c                     up to 1.1.1.3
        external/bsd/nsd/dist/udbradtree.c              up to 1.1.1.2
        external/bsd/nsd/dist/udbradtree.h              up to 1.1.1.2
        external/bsd/nsd/dist/udbzone.h                 up to 1.1.1.2
        external/bsd/nsd/dist/util.c                    up to 1.1.1.2
        external/bsd/nsd/dist/util.h                    up to 1.3
        external/bsd/nsd/dist/xfrd-disk.c               up to 1.1.1.3
        external/bsd/nsd/dist/xfrd-notify.c             up to 1.1.1.2
        external/bsd/nsd/dist/xfrd-notify.h             up to 1.1.1.2
        external/bsd/nsd/dist/xfrd-tcp.c                up to 1.1.1.2
        external/bsd/nsd/dist/xfrd-tcp.h                up to 1.1.1.2
        external/bsd/nsd/dist/xfrd.c                    up to 1.1.1.3
        external/bsd/nsd/dist/xfrd.h                    up to 1.1.1.2
        external/bsd/nsd/dist/zlexer.c                  up to 1.3
        external/bsd/nsd/dist/zlexer.lex                up to 1.1.1.2
        external/bsd/nsd/dist/zonec.c                   up to 1.1.1.3
        external/bsd/nsd/dist/zonec.h                   up to 1.1.1.2
        external/bsd/nsd/dist/zparser.c                 up to 1.3
        external/bsd/nsd/dist/zparser.h                 up to 1.3
        external/bsd/nsd/dist/zparser.y                 up to 1.1.1.3
        external/bsd/nsd/dist/contrib/README            up to 1.1.1.2
        external/bsd/nsd/dist/doc/ChangeLog             up to 1.1.1.3
        external/bsd/nsd/dist/doc/README                up to 1.1.1.3
        external/bsd/nsd/dist/doc/RELNOTES              up to 1.1.1.3
        external/bsd/nsd/etc/rc.d/nsd                   up to 1.2
        external/bsd/nsd/include/config.h               up to 1.3

Update from NSD 4.1.14 to 4.1.24

diffstat:

 external/bsd/nsd/Makefile.inc             |    10 +-
 external/bsd/nsd/dist/Makefile.in         |    18 +-
 external/bsd/nsd/dist/axfr.c              |     5 +-
 external/bsd/nsd/dist/config.h.in         |    21 +
 external/bsd/nsd/dist/configlexer.c       |  1814 ++++++++++++++--------------
 external/bsd/nsd/dist/configlexer.lex     |     3 +
 external/bsd/nsd/dist/configparser.c      |   946 ++++++++-------
 external/bsd/nsd/dist/configparser.h      |    10 +-
 external/bsd/nsd/dist/configparser.y      |    74 +-
 external/bsd/nsd/dist/configure           |   129 +-
 external/bsd/nsd/dist/configure.ac        |    38 +-
 external/bsd/nsd/dist/contrib/README      |     3 +
 external/bsd/nsd/dist/contrib/nsd.service |    28 +
 external/bsd/nsd/dist/contrib/nsd.socket  |     6 +
 external/bsd/nsd/dist/dbaccess.c          |    20 +-
 external/bsd/nsd/dist/dbcreate.c          |    10 +-
 external/bsd/nsd/dist/difffile.c          |    56 +-
 external/bsd/nsd/dist/difffile.h          |     7 +-
 external/bsd/nsd/dist/dns.c               |    11 +-
 external/bsd/nsd/dist/dns.h               |     6 +-
 external/bsd/nsd/dist/doc/ChangeLog       |   278 ++++
 external/bsd/nsd/dist/doc/README          |     8 +-
 external/bsd/nsd/dist/doc/RELNOTES        |   147 ++
 external/bsd/nsd/dist/ipc.c               |    44 +-
 external/bsd/nsd/dist/lookup3.c           |    14 +
 external/bsd/nsd/dist/mini_event.c        |     2 +-
 external/bsd/nsd/dist/mini_event.h        |     4 +-
 external/bsd/nsd/dist/namedb.c            |    61 +-
 external/bsd/nsd/dist/namedb.h            |    78 +-
 external/bsd/nsd/dist/netio.c             |     2 +-
 external/bsd/nsd/dist/nsd-checkconf.8.in  |     2 +-
 external/bsd/nsd/dist/nsd-checkconf.c     |    60 +-
 external/bsd/nsd/dist/nsd-checkzone.8.in  |     2 +-
 external/bsd/nsd/dist/nsd-checkzone.c     |     2 +-
 external/bsd/nsd/dist/nsd-control.8.in    |     2 +-
 external/bsd/nsd/dist/nsd-control.c       |   137 +-
 external/bsd/nsd/dist/nsd-mem.c           |    14 +-
 external/bsd/nsd/dist/nsd.8.in            |     4 +-
 external/bsd/nsd/dist/nsd.c               |    20 +-
 external/bsd/nsd/dist/nsd.conf.5.in       |    28 +-
 external/bsd/nsd/dist/nsd.conf.sample.in  |    11 +
 external/bsd/nsd/dist/nsd.h               |    24 +-
 external/bsd/nsd/dist/nsec3.c             |   320 +++-
 external/bsd/nsd/dist/nsec3.h             |     2 +-
 external/bsd/nsd/dist/options.c           |   309 ++--
 external/bsd/nsd/dist/options.h           |   194 +-
 external/bsd/nsd/dist/packet.c            |     1 +
 external/bsd/nsd/dist/packet.h            |     2 +
 external/bsd/nsd/dist/query.c             |    33 +-
 external/bsd/nsd/dist/query.h             |     5 +-
 external/bsd/nsd/dist/radtree.c           |    64 +-
 external/bsd/nsd/dist/radtree.h           |    29 +-
 external/bsd/nsd/dist/rbtree.c            |    94 +-
 external/bsd/nsd/dist/rbtree.h            |    54 +-
 external/bsd/nsd/dist/rdata.c             |    14 +-
 external/bsd/nsd/dist/region-allocator.c  |    13 +-
 external/bsd/nsd/dist/remote.c            |   822 ++++++++----
 external/bsd/nsd/dist/remote.h            |     9 +
 external/bsd/nsd/dist/rrl.c               |    32 +-
 external/bsd/nsd/dist/rrl.h               |     8 +
 external/bsd/nsd/dist/server.c            |    69 +-
 external/bsd/nsd/dist/systemd.m4          |    30 +
 external/bsd/nsd/dist/tsig.c              |     6 +-
 external/bsd/nsd/dist/udb.c               |    10 +-
 external/bsd/nsd/dist/udbradtree.c        |    83 +-
 external/bsd/nsd/dist/udbradtree.h        |    12 +-
 external/bsd/nsd/dist/udbzone.h           |     4 +-
 external/bsd/nsd/dist/util.c              |     4 +
 external/bsd/nsd/dist/util.h              |     4 +
 external/bsd/nsd/dist/xfr-inspect.c       |   531 ++++++++
 external/bsd/nsd/dist/xfrd-disk.c         |    22 +-
 external/bsd/nsd/dist/xfrd-notify.c       |   393 ++++-
 external/bsd/nsd/dist/xfrd-notify.h       |    39 +-
 external/bsd/nsd/dist/xfrd-tcp.c          |   101 +-
 external/bsd/nsd/dist/xfrd-tcp.h          |    31 +-
 external/bsd/nsd/dist/xfrd.c              |   255 ++-
 external/bsd/nsd/dist/xfrd.h              |   106 +-
 external/bsd/nsd/dist/zlexer.c            |   200 +-
 external/bsd/nsd/dist/zlexer.lex          |    19 +-
 external/bsd/nsd/dist/zonec.c             |    21 +-
 external/bsd/nsd/dist/zonec.h             |     1 +
 external/bsd/nsd/dist/zparser.c           |  1440 +++++++++++-----------
 external/bsd/nsd/dist/zparser.h           |    50 +-
 external/bsd/nsd/dist/zparser.y           |    25 +-
 external/bsd/nsd/etc/rc.d/nsd             |     5 +-
 external/bsd/nsd/include/config.h         |    30 +-
 86 files changed, 6042 insertions(+), 3613 deletions(-)

diffs (truncated from 18980 to 300 lines):

diff -r 8e8fa582673f -r 43a06cba0643 external/bsd/nsd/Makefile.inc
--- a/external/bsd/nsd/Makefile.inc     Sat Oct 13 17:21:51 2018 +0000
+++ b/external/bsd/nsd/Makefile.inc     Sat Oct 13 17:30:00 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1.8.1 2017/07/12 13:56:46 martin Exp $
+# $NetBSD: Makefile.inc,v 1.1.8.2 2018/10/13 17:30:00 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -14,9 +14,13 @@
 CPPFLAGS+=      -DINET6
 .endif
 
+.if ${HAVE_OPENSSL} < 11
+CPPFLAGS+=     -DOPENSSL_API_COMPAT=0x10100000L
+.endif
+
 DPLIBS+= event ${NETBSDSRCDIR}/external/bsd/libevent/lib/libevent
-DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
-DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
+DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
 DPLIBS+= crypt ${NETBSDSRCDIR}/lib/libcrypt
 DPLIBS+= util ${NETBSDSRCDIR}/lib/libutil
 DPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
diff -r 8e8fa582673f -r 43a06cba0643 external/bsd/nsd/dist/Makefile.in
--- a/external/bsd/nsd/dist/Makefile.in Sat Oct 13 17:21:51 2018 +0000
+++ b/external/bsd/nsd/dist/Makefile.in Sat Oct 13 17:30:00 2018 +0000
@@ -167,8 +167,11 @@
 udb-inspect:   udb-inspect.o $(COMMON_OBJ) $(LIBOBJS)
        $(LINK) -o $@ udb-inspect.o $(COMMON_OBJ) $(LIBOBJS) $(LIBS)
 
+xfr-inspect:   xfr-inspect.o $(COMMON_OBJ) $(LIBOBJS)
+       $(LINK) -o $@ xfr-inspect.o $(COMMON_OBJ) $(LIBOBJS) $(LIBS)
+
 clean:
-       rm -f *.o $(TARGETS) $(MANUALS) cutest udb-inspect nsd-mem
+       rm -f *.o $(TARGETS) $(MANUALS) cutest udb-inspect xfr-inspect nsd-mem
 
 realclean: clean
        rm -f Makefile config.h config.log config.status
@@ -286,6 +289,7 @@
                echo '#include "config.h"' > $@ ;\
                $(LEX) -i -t $(srcdir)/zlexer.lex >> $@ ;\
        fi
+       @if test ! -f $@; then echo "No $@ : need flex and bison to compile from source repository"; exit 1; fi
 
 zparser.c zparser.h: $(srcdir)/zparser.y
        $(YACC) -d -o zparser.c $(srcdir)/zparser.y
@@ -295,6 +299,7 @@
                echo '#include "configyyrename.h"' > $@ ;\
                $(LEX) -i -t $(srcdir)/configlexer.lex >> $@ ;\
        fi
+       @if test ! -f $@; then echo "No $@ : need flex and bison to compile from source repository"; exit 1; fi
 
 configparser.c configparser.h: $(srcdir)/configparser.y
        $(YACC) -d -o configparser.c $(srcdir)/configparser.y
@@ -364,10 +369,12 @@
  $(srcdir)/util.h $(srcdir)/query.h $(srcdir)/namedb.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/packet.h $(srcdir)/tsig.h
 dns.o: $(srcdir)/dns.c config.h $(srcdir)/dns.h $(srcdir)/zonec.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/radtree.h $(srcdir)/rbtree.h zparser.h
-edns.o: $(srcdir)/edns.c config.h $(srcdir)/dns.h $(srcdir)/edns.h $(srcdir)/buffer.h $(srcdir)/region-allocator.h $(srcdir)/util.h
+edns.o: $(srcdir)/edns.c config.h $(srcdir)/dns.h $(srcdir)/edns.h $(srcdir)/buffer.h $(srcdir)/region-allocator.h $(srcdir)/util.h \
+ $(srcdir)/nsd.h $(srcdir)/query.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/packet.h $(srcdir)/tsig.h
 ipc.o: $(srcdir)/ipc.c config.h $(srcdir)/ipc.h $(srcdir)/netio.h $(srcdir)/region-allocator.h $(srcdir)/buffer.h $(srcdir)/util.h \
  $(srcdir)/xfrd-tcp.h $(srcdir)/xfrd.h $(srcdir)/rbtree.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/options.h \
- $(srcdir)/tsig.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/xfrd-notify.h $(srcdir)/difffile.h $(srcdir)/udb.h
+ $(srcdir)/tsig.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/xfrd-notify.h $(srcdir)/difffile.h $(srcdir)/udb.h $(srcdir)/rrl.h $(srcdir)/query.h \
+ $(srcdir)/packet.h
 iterated_hash.o: $(srcdir)/iterated_hash.c config.h $(srcdir)/iterated_hash.h
 lookup3.o: $(srcdir)/lookup3.c config.h $(srcdir)/lookup3.h
 mini_event.o: $(srcdir)/mini_event.c config.h
@@ -430,7 +437,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)/difffile.h $(srcdir)/udb.h $(srcdir)/ipc.h $(srcdir)/remote.h $(srcdir)/rrl.h $(srcdir)/query.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
@@ -440,6 +447,9 @@
 xfrd-tcp.o: $(srcdir)/xfrd-tcp.c config.h $(srcdir)/nsd.h $(srcdir)/dns.h $(srcdir)/edns.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/xfrd-tcp.h $(srcdir)/xfrd.h $(srcdir)/rbtree.h $(srcdir)/namedb.h $(srcdir)/dname.h \
  $(srcdir)/radtree.h $(srcdir)/options.h $(srcdir)/tsig.h $(srcdir)/packet.h $(srcdir)/xfrd-disk.h
+xfr-inspect.o: $(srcdir)/xfr-inspect.c config.h $(srcdir)/udbzone.h $(srcdir)/udb.h $(srcdir)/dns.h $(srcdir)/udbradtree.h \
+ $(srcdir)/util.h $(srcdir)/buffer.h $(srcdir)/region-allocator.h $(srcdir)/packet.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/radtree.h \
+ $(srcdir)/rbtree.h $(srcdir)/rdata.h $(srcdir)/difffile.h $(srcdir)/options.h
 zlexer.o: zlexer.c config.h $(srcdir)/zonec.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/rbtree.h zparser.h
 zonec.o: $(srcdir)/zonec.c config.h $(srcdir)/zonec.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h \
diff -r 8e8fa582673f -r 43a06cba0643 external/bsd/nsd/dist/axfr.c
--- a/external/bsd/nsd/dist/axfr.c      Sat Oct 13 17:21:51 2018 +0000
+++ b/external/bsd/nsd/dist/axfr.c      Sat Oct 13 17:30:00 2018 +0000
@@ -164,12 +164,12 @@
 query_state_type
 answer_axfr_ixfr(struct nsd *nsd, struct query *q)
 {
-       acl_options_t *acl = NULL;
+       struct acl_options *acl = NULL;
        /* Is it AXFR? */
        switch (q->qtype) {
        case TYPE_AXFR:
                if (q->tcp) {
-                       zone_options_t* zone_opt;
+                       struct zone_options* zone_opt;
                        zone_opt = zone_options_find(nsd->options, q->qname);
                        if(!zone_opt ||
                           acl_check_incoming(zone_opt->pattern->provide_xfr, q, &acl)==-1)
@@ -201,6 +201,7 @@
                        return query_axfr(nsd, q);
                }
                /** Fallthrough: AXFR over UDP queries are discarded. */
+               /* fallthrough */
        case TYPE_IXFR:
                RCODE_SET(q->packet, RCODE_IMPL);
                return QUERY_PROCESSED;
diff -r 8e8fa582673f -r 43a06cba0643 external/bsd/nsd/dist/config.h.in
--- a/external/bsd/nsd/dist/config.h.in Sat Oct 13 17:21:51 2018 +0000
+++ b/external/bsd/nsd/dist/config.h.in Sat Oct 13 17:30:00 2018 +0000
@@ -25,6 +25,9 @@
 /* Define to the default facility for syslog. */
 #undef FACILITY
 
+/* Define to 1 if you have the `accept4' function. */
+#undef HAVE_ACCEPT4
+
 /* Define to 1 if you have the `alarm' function. */
 #undef HAVE_ALARM
 
@@ -314,6 +317,9 @@
 /* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
 
+/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */
+#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
+
 /* Define to 1 if `st_mtimensec' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_MTIMENSEC
 
@@ -347,6 +353,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/un.h> header file. */
+#undef HAVE_SYS_UN_H
+
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
@@ -392,6 +401,9 @@
 /* Define to the maximum message length to pass to syslog. */
 #undef MAXSYSLOGMSGLEN
 
+/* Define this to cleanup memory at exit (eg. for valgrind, etc.) */
+#undef MEMCLEAN
+
 /* Define if memcmp() does not compare unsigned bytes */
 #undef MEMCMP_IS_BROKEN
 
@@ -438,6 +450,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define this to use packed structure alignment. */
+#undef PACKED_STRUCTS
+
 /* Pathname to the NSD pidfile */
 #undef PIDFILE
 
@@ -832,3 +847,9 @@
 #endif /* !HAVE_STRUCT_TIMESPEC */
 #endif /* !CONFIG_DEFINES */
 
+#ifdef PACKED_STRUCTS
+#define ATTR_PACKED __attribute__((packed))
+#else
+#define ATTR_PACKED
+#endif
+
diff -r 8e8fa582673f -r 43a06cba0643 external/bsd/nsd/dist/configlexer.c
--- a/external/bsd/nsd/dist/configlexer.c       Sat Oct 13 17:21:51 2018 +0000
+++ b/external/bsd/nsd/dist/configlexer.c       Sat Oct 13 17:30:00 2018 +0000
@@ -9,7 +9,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_SUBMINOR_VERSION 1
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -88,25 +88,13 @@
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else  /* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Returned upon end-of-file. */
@@ -167,7 +155,7 @@
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t yyleng;
+extern int yyleng;
 
 extern FILE *yyin, *yyout;
 
@@ -206,12 +194,12 @@
        /* Size of input buffer in bytes, not including room for EOB
         * characters.
         */
-       yy_size_t yy_buf_size;
+       int yy_buf_size;
 
        /* Number of characters read into yy_ch_buf, not including EOB
         * characters.
         */
-       yy_size_t yy_n_chars;
+       int yy_n_chars;
 
        /* Whether we "own" the buffer - i.e., we know we created it,
         * and can realloc() it to grow it, and should free() it to
@@ -262,7 +250,7 @@
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -281,11 +269,11 @@
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;           /* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+static int yy_n_chars;         /* number of characters read into yy_ch_buf */
+int yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
 static int yy_init = 0;                /* whether we need to initialize */
 static int yy_start = 0;       /* start state number */
 
@@ -310,7 +298,7 @@
 
 YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
 
 void *yyalloc (yy_size_t  );
 void *yyrealloc (void *,yy_size_t  );
@@ -344,7 +332,7 @@
 
 typedef unsigned char YY_CHAR;
 
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+FILE *yyin = NULL, *yyout = NULL;
 
 typedef int yy_state_type;
 
@@ -361,10 +349,7 @@
 static yy_state_type yy_get_previous_state (void );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
 static int yy_get_next_buffer (void );
-#if defined(__GNUC__) && __GNUC__ >= 3
-__attribute__((__noreturn__))
-#endif
-static void yy_fatal_error (yyconst char msg[]  );
+static void yynoreturn yy_fatal_error (yyconst char* msg  );
 
 /* Done after the current pattern has been matched and before the



Home | Main Index | Thread Index | Old Index