Module Name: src
Committed By: christos
Date: Sun Apr 3 01:11:00 UTC 2022
Modified Files:
src/external/mpl/dhcp/dist/client: client_tables.c clparse.c dhc6.c
dhclient-script.8 dhclient.8 dhclient.c dhclient.conf.5
dhclient.leases.5
src/external/mpl/dhcp/dist/client/tests: duid_unittest.c
src/external/mpl/dhcp/dist/common: alloc.c bpf.c comapi.c conflex.c
ctrace.c dhcp-eval.5 dhcp-options.5 dhcp4o6.c discover.c dispatch.c
dlpi.c dns.c ethernet.c execute.c fddi.c icmp.c inet.c lpf.c
memory.c nit.c ns_name.c options.c packet.c parse.c print.c raw.c
resolv.c socket.c tables.c tr.c tree.c upf.c
src/external/mpl/dhcp/dist/common/tests: option_unittest.c
src/external/mpl/dhcp/dist/dhcpctl: callback.c cltest.c cltest2.c
dhcpctl.3 dhcpctl.c dhcpctl.h omshell.1 omshell.c remote.c
src/external/mpl/dhcp/dist/doc/ja_JP.eucJP: dhclient-script.8
dhclient.8 dhclient.conf.5 dhclient.leases.5 dhcp-eval.5
dhcp-options.5
src/external/mpl/dhcp/dist/includes: cdefs.h ctrace.h dhcp.h dhcp6.h
dhcpd.h dhctoken.h failover.h inet.h ldap_casa.h ns_name.h osdep.h
site.h statement.h tree.h
src/external/mpl/dhcp/dist/includes/arpa: nameser.h
src/external/mpl/dhcp/dist/includes/netinet: udp.h
src/external/mpl/dhcp/dist/includes/omapip: alloc.h buffer.h convert.h
hash.h isclib.h omapip.h omapip_p.h result.h trace.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: alloc.c array.c auth.c buffer.c
connection.c convert.c dispatch.c errwarn.c generic.c handle.c
hash.c isclib.c listener.c message.c omapi.3 protocol.c result.c
support.c test.c toisc.c trace.c
src/external/mpl/dhcp/dist/relay: dhcrelay.8 dhcrelay.c
src/external/mpl/dhcp/dist/relay/tests: relay_unittests.c
src/external/mpl/dhcp/dist/server: bootp.c class.c confpars.c db.c
ddns.c dhcp.c dhcpd.8 dhcpd.c dhcpd.conf.5 dhcpd.leases.5
failover.c ldap.c ldap_casa.c leasechain.c mdb.c mdb6.c omapi.c
salloc.c stables.c
src/external/mpl/dhcp/dist/server/tests: hash_unittest.c
Log Message:
Merge conflicts between dhcp-4.4.2P1 and dhcp-4.4.3
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/client/client_tables.c \
src/external/mpl/dhcp/dist/client/dhclient-script.8 \
src/external/mpl/dhcp/dist/client/dhclient.conf.5 \
src/external/mpl/dhcp/dist/client/dhclient.leases.5
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/client/clparse.c \
src/external/mpl/dhcp/dist/client/dhc6.c \
src/external/mpl/dhcp/dist/client/dhclient.8
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/client/dhclient.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/mpl/dhcp/dist/client/tests/duid_unittest.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/common/alloc.c \
src/external/mpl/dhcp/dist/common/comapi.c \
src/external/mpl/dhcp/dist/common/conflex.c \
src/external/mpl/dhcp/dist/common/ctrace.c \
src/external/mpl/dhcp/dist/common/dhcp-eval.5 \
src/external/mpl/dhcp/dist/common/dhcp4o6.c \
src/external/mpl/dhcp/dist/common/dispatch.c \
src/external/mpl/dhcp/dist/common/dlpi.c \
src/external/mpl/dhcp/dist/common/ethernet.c \
src/external/mpl/dhcp/dist/common/fddi.c \
src/external/mpl/dhcp/dist/common/icmp.c \
src/external/mpl/dhcp/dist/common/inet.c \
src/external/mpl/dhcp/dist/common/memory.c \
src/external/mpl/dhcp/dist/common/nit.c \
src/external/mpl/dhcp/dist/common/print.c \
src/external/mpl/dhcp/dist/common/resolv.c \
src/external/mpl/dhcp/dist/common/tr.c \
src/external/mpl/dhcp/dist/common/tree.c \
src/external/mpl/dhcp/dist/common/upf.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/common/bpf.c \
src/external/mpl/dhcp/dist/common/discover.c \
src/external/mpl/dhcp/dist/common/dns.c \
src/external/mpl/dhcp/dist/common/parse.c \
src/external/mpl/dhcp/dist/common/socket.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/common/dhcp-options.5 \
src/external/mpl/dhcp/dist/common/execute.c \
src/external/mpl/dhcp/dist/common/lpf.c \
src/external/mpl/dhcp/dist/common/ns_name.c \
src/external/mpl/dhcp/dist/common/packet.c \
src/external/mpl/dhcp/dist/common/raw.c \
src/external/mpl/dhcp/dist/common/tables.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/dhcp/dist/common/options.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/dhcp/dist/common/tests/option_unittest.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/dhcpctl/callback.c \
src/external/mpl/dhcp/dist/dhcpctl/cltest.c \
src/external/mpl/dhcp/dist/dhcpctl/dhcpctl.3 \
src/external/mpl/dhcp/dist/dhcpctl/dhcpctl.c \
src/external/mpl/dhcp/dist/dhcpctl/dhcpctl.h \
src/external/mpl/dhcp/dist/dhcpctl/omshell.1 \
src/external/mpl/dhcp/dist/dhcpctl/omshell.c \
src/external/mpl/dhcp/dist/dhcpctl/remote.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mpl/dhcp/dist/dhcpctl/cltest2.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhclient-script.8 \
src/external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhclient.8 \
src/external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhclient.conf.5 \
src/external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhclient.leases.5 \
src/external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhcp-eval.5 \
src/external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhcp-options.5
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/includes/cdefs.h \
src/external/mpl/dhcp/dist/includes/ctrace.h \
src/external/mpl/dhcp/dist/includes/dhcp.h \
src/external/mpl/dhcp/dist/includes/dhcp6.h \
src/external/mpl/dhcp/dist/includes/dhctoken.h \
src/external/mpl/dhcp/dist/includes/failover.h \
src/external/mpl/dhcp/dist/includes/inet.h \
src/external/mpl/dhcp/dist/includes/ldap_casa.h \
src/external/mpl/dhcp/dist/includes/site.h \
src/external/mpl/dhcp/dist/includes/statement.h \
src/external/mpl/dhcp/dist/includes/tree.h
cvs rdiff -u -r1.3 -r1.4 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/arpa/nameser.h
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/includes/netinet/udp.h
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/includes/omapip/alloc.h \
src/external/mpl/dhcp/dist/includes/omapip/buffer.h \
src/external/mpl/dhcp/dist/includes/omapip/convert.h \
src/external/mpl/dhcp/dist/includes/omapip/hash.h \
src/external/mpl/dhcp/dist/includes/omapip/omapip.h \
src/external/mpl/dhcp/dist/includes/omapip/trace.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/includes/omapip/isclib.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/dhcp/dist/includes/omapip/omapip_p.h \
src/external/mpl/dhcp/dist/includes/omapip/result.h
cvs rdiff -u -r1.2 -r1.3 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/alloc.c \
src/external/mpl/dhcp/dist/omapip/array.c \
src/external/mpl/dhcp/dist/omapip/auth.c \
src/external/mpl/dhcp/dist/omapip/convert.c \
src/external/mpl/dhcp/dist/omapip/generic.c \
src/external/mpl/dhcp/dist/omapip/handle.c \
src/external/mpl/dhcp/dist/omapip/hash.c \
src/external/mpl/dhcp/dist/omapip/listener.c \
src/external/mpl/dhcp/dist/omapip/message.c \
src/external/mpl/dhcp/dist/omapip/omapi.3 \
src/external/mpl/dhcp/dist/omapip/protocol.c \
src/external/mpl/dhcp/dist/omapip/support.c \
src/external/mpl/dhcp/dist/omapip/test.c \
src/external/mpl/dhcp/dist/omapip/toisc.c \
src/external/mpl/dhcp/dist/omapip/trace.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/omapip/buffer.c \
src/external/mpl/dhcp/dist/omapip/dispatch.c \
src/external/mpl/dhcp/dist/omapip/errwarn.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/omapip/connection.c \
src/external/mpl/dhcp/dist/omapip/result.c
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/dhcp/dist/omapip/isclib.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/relay/dhcrelay.8
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/dhcp/dist/relay/dhcrelay.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/dhcp/dist/relay/tests/relay_unittests.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/server/bootp.c \
src/external/mpl/dhcp/dist/server/db.c \
src/external/mpl/dhcp/dist/server/dhcpd.8 \
src/external/mpl/dhcp/dist/server/dhcpd.leases.5 \
src/external/mpl/dhcp/dist/server/ldap_casa.c \
src/external/mpl/dhcp/dist/server/leasechain.c \
src/external/mpl/dhcp/dist/server/omapi.c \
src/external/mpl/dhcp/dist/server/salloc.c
cvs rdiff -u -r1.3 -r1.4 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.conf.5 \
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.4 -r1.5 src/external/mpl/dhcp/dist/server/dhcpd.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/dhcp/dist/server/mdb6.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/mpl/dhcp/dist/server/tests/hash_unittest.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
