Module Name: src Committed By: spz Date: Sat Jul 12 12:09:38 UTC 2014
Modified Files: src/external/bsd/dhcp/dist/client: dhc6.c dhclient.8 dhclient.c src/external/bsd/dhcp/dist/common: alloc.c bpf.c conflex.c discover.c dispatch.c dns.c icmp.c ns_name.c src/external/bsd/dhcp/dist/dst: base64.c dst_api.c src/external/bsd/dhcp/dist/includes: dhcpd.h src/external/bsd/dhcp/dist/omapip: dispatch.c isclib.c src/external/bsd/dhcp/dist/relay: dhcrelay.c src/external/bsd/dhcp/dist/server: confpars.c ddns.c dhcpd.c dhcpleasequery.c dhcpv6.c mdb.c mdb6.c omapi.c Log Message: merge and fixup To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/dist/client/dhc6.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/client/dhclient.8 cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcp/dist/client/dhclient.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/common/alloc.c \ src/external/bsd/dhcp/dist/common/bpf.c \ src/external/bsd/dhcp/dist/common/icmp.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/common/conflex.c \ src/external/bsd/dhcp/dist/common/discover.c \ src/external/bsd/dhcp/dist/common/dispatch.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcp/dist/common/dns.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcp/dist/common/ns_name.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/dist/dst/base64.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/dst/dst_api.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/dist/includes/dhcpd.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/omapip/dispatch.c cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/dhcp/dist/omapip/isclib.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcp/dist/relay/dhcrelay.c cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/dhcp/dist/server/confpars.c \ src/external/bsd/dhcp/dist/server/mdb.c \ src/external/bsd/dhcp/dist/server/omapi.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/server/ddns.c \ src/external/bsd/dhcp/dist/server/dhcpd.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcp/dist/server/dhcpleasequery.c \ src/external/bsd/dhcp/dist/server/dhcpv6.c \ src/external/bsd/dhcp/dist/server/mdb6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.