CVS commit: src/external/bsd/nsd

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sun Dec 15 16:26:04 UTC 2019

Modified Files:
        src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h
            configure.ac server.c util.h zlexer.c zparser.c
        src/external/bsd/nsd/include: config.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/dist/configlexer.c \
    src/external/bsd/nsd/dist/configparser.c \
    src/external/bsd/nsd/dist/configparser.h \
    src/external/bsd/nsd/dist/zparser.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/dist/server.c \
    src/external/bsd/nsd/dist/util.h src/external/bsd/nsd/dist/zlexer.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nsd/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.