CVS commit: basesrc

[Ted Lemon <mellon%netbsd.org@localhost>]

Module Name:    basesrc
Committed By:   mellon
Date:           Sat Jul  8 20:52:21 UTC 2000

Modified Files:
        basesrc/usr.sbin/dhcp/common: comapi.c discover.c options.c
        basesrc/usr.sbin/dhcp/includes: dhcpd.h site.h version.h
        basesrc/usr.sbin/dhcp/omapip: dispatch.c
        basesrc/usr.sbin/dhcp/server: confpars.c dhcp.c dhcpd.c dhcpd.conf.5
            omapi.c

Log Message:
Fix conflicts in latest import.


To generate a diff of this commit:
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/dhcp/common/comapi.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/common/discover.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/common/options.c
cvs rdiff -r1.13 -r1.14 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/includes/site.h
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/includes/version.h
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/omapip/dispatch.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/server/confpars.c
cvs rdiff -r1.14 -r1.15 basesrc/usr.sbin/dhcp/server/dhcp.c
cvs rdiff -r1.19 -r1.20 basesrc/usr.sbin/dhcp/server/dhcpd.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/dhcp/server/dhcpd.conf.5
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/server/omapi.c

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