Module Name:	basesrc
Committed By:	christos
Date:		Wed Aug 25 02:07:46 UTC 1999

Modified Files:
	basesrc/usr.sbin/pppd/pppd: Makefile auth.c cbcp.c ccp.c ccp.h chap.c
	    chap_ms.c demand.c eui64.c eui64.h fsm.c ipcp.c ipcp.h ipv6cp.c
	    ipv6cp.h ipxcp.c ipxcp.h lcp.c lcp.h magic.c main.c options.c
	    patchlevel.h pathnames.h pppd.8 pppd.h sys-bsd.c upap.c utils.c

Log Message:
merge changes.


To generate a diff of this commit:
cvs rdiff -r1.25 -r1.26 basesrc/usr.sbin/pppd/pppd/Makefile
cvs rdiff -r1.24 -r1.25 basesrc/usr.sbin/pppd/pppd/auth.c \
    basesrc/usr.sbin/pppd/pppd/pppd.8
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/pppd/pppd/cbcp.c
cvs rdiff -r1.9 -r1.10 basesrc/usr.sbin/pppd/pppd/ccp.c \
    basesrc/usr.sbin/pppd/pppd/chap_ms.c basesrc/usr.sbin/pppd/pppd/lcp.h
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/pppd/pppd/ccp.h
cvs rdiff -r1.13 -r1.14 basesrc/usr.sbin/pppd/pppd/chap.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/pppd/pppd/demand.c
cvs rdiff -r1.1.1.1 -r1.2 basesrc/usr.sbin/pppd/pppd/eui64.c \
    basesrc/usr.sbin/pppd/pppd/eui64.h basesrc/usr.sbin/pppd/pppd/ipv6cp.c \
    basesrc/usr.sbin/pppd/pppd/ipv6cp.h basesrc/usr.sbin/pppd/pppd/utils.c
cvs rdiff -r1.11 -r1.12 basesrc/usr.sbin/pppd/pppd/fsm.c \
    basesrc/usr.sbin/pppd/pppd/ipcp.h
cvs rdiff -r1.17 -r1.18 basesrc/usr.sbin/pppd/pppd/ipcp.c \
    basesrc/usr.sbin/pppd/pppd/patchlevel.h
cvs rdiff -r1.6 -r1.7 basesrc/usr.sbin/pppd/pppd/ipxcp.c
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/pppd/pppd/ipxcp.h
cvs rdiff -r1.19 -r1.20 basesrc/usr.sbin/pppd/pppd/lcp.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/pppd/pppd/magic.c
cvs rdiff -r1.34 -r1.35 basesrc/usr.sbin/pppd/pppd/main.c
cvs rdiff -r1.29 -r1.30 basesrc/usr.sbin/pppd/pppd/options.c
cvs rdiff -r1.10 -r1.11 basesrc/usr.sbin/pppd/pppd/pathnames.h \
    basesrc/usr.sbin/pppd/pppd/upap.c
cvs rdiff -r1.18 -r1.19 basesrc/usr.sbin/pppd/pppd/pppd.h
cvs rdiff -r1.30 -r1.31 basesrc/usr.sbin/pppd/pppd/sys-bsd.c

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