Module Name: src
Committed By: christos
Date: Mon Aug 3 21:10:58 UTC 2020
Modified Files:
src/external/mpl/dhcp: dhcp2netbsd
src/external/mpl/dhcp/dist/client: clparse.c dhc6.c dhclient.8
dhclient.c
src/external/mpl/dhcp/dist/common: dhcp-options.5 discover.c dns.c
execute.c ns_name.c options.c parse.c socket.c tables.c
src/external/mpl/dhcp/dist/common/tests: domain_name_test.c
src/external/mpl/dhcp/dist/includes: dhcpd.h ns_name.h osdep.h
src/external/mpl/dhcp/dist/includes/omapip: isclib.h omapip_p.h
result.h
src/external/mpl/dhcp/dist/keama: conflex.c confparse.c data.c data.h
dhctoken.h eval.c json.c keama.8 keama.c keama.h options.c parse.c
print.c reduce.c
src/external/mpl/dhcp/dist/omapip: errwarn.c isclib.c
src/external/mpl/dhcp/dist/relay: dhcrelay.c
src/external/mpl/dhcp/dist/relay/tests: relay_unittests.c
src/external/mpl/dhcp/dist/server: class.c confpars.c ddns.c dhcp.c
dhcpd.c dhcpd.conf.5 dhcpleasequery.c dhcpv6.c failover.c ldap.c
mdb.c mdb6.c stables.c
src/external/mpl/dhcp/include: config.h
Log Message:
Merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dhcp2netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/client/clparse.c \
src/external/mpl/dhcp/dist/client/dhc6.c \
src/external/mpl/dhcp/dist/client/dhclient.8 \
src/external/mpl/dhcp/dist/client/dhclient.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/common/dhcp-options.5 \
src/external/mpl/dhcp/dist/common/execute.c \
src/external/mpl/dhcp/dist/common/ns_name.c \
src/external/mpl/dhcp/dist/common/options.c \
src/external/mpl/dhcp/dist/common/parse.c \
src/external/mpl/dhcp/dist/common/tables.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/common/discover.c \
src/external/mpl/dhcp/dist/common/dns.c \
src/external/mpl/dhcp/dist/common/socket.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mpl/dhcp/dist/common/tests/domain_name_test.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/includes/dhcpd.h \
src/external/mpl/dhcp/dist/includes/ns_name.h \
src/external/mpl/dhcp/dist/includes/osdep.h
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/includes/omapip/isclib.h \
src/external/mpl/dhcp/dist/includes/omapip/omapip_p.h \
src/external/mpl/dhcp/dist/includes/omapip/result.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mpl/dhcp/dist/keama/conflex.c \
src/external/mpl/dhcp/dist/keama/confparse.c \
src/external/mpl/dhcp/dist/keama/data.c \
src/external/mpl/dhcp/dist/keama/data.h \
src/external/mpl/dhcp/dist/keama/dhctoken.h \
src/external/mpl/dhcp/dist/keama/eval.c \
src/external/mpl/dhcp/dist/keama/json.c \
src/external/mpl/dhcp/dist/keama/keama.8 \
src/external/mpl/dhcp/dist/keama/keama.c \
src/external/mpl/dhcp/dist/keama/keama.h \
src/external/mpl/dhcp/dist/keama/options.c \
src/external/mpl/dhcp/dist/keama/parse.c \
src/external/mpl/dhcp/dist/keama/print.c \
src/external/mpl/dhcp/dist/keama/reduce.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/omapip/errwarn.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/omapip/isclib.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/relay/dhcrelay.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mpl/dhcp/dist/relay/tests/relay_unittests.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/server/class.c \
src/external/mpl/dhcp/dist/server/confpars.c \
src/external/mpl/dhcp/dist/server/ddns.c \
src/external/mpl/dhcp/dist/server/dhcp.c \
src/external/mpl/dhcp/dist/server/dhcpd.c \
src/external/mpl/dhcp/dist/server/dhcpd.conf.5 \
src/external/mpl/dhcp/dist/server/dhcpleasequery.c \
src/external/mpl/dhcp/dist/server/failover.c \
src/external/mpl/dhcp/dist/server/ldap.c \
src/external/mpl/dhcp/dist/server/mdb.c \
src/external/mpl/dhcp/dist/server/stables.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/server/dhcpv6.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/server/mdb6.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
