CVS commit: src/external/bsd/nsd

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    src
Committed By:   prlw1
Date:           Tue Feb 12 16:11:11 UTC 2019

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

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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/util.h \
    src/external/bsd/nsd/dist/zparser.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/server.c
cvs rdiff -u -r1.5 -r1.6 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.