Module Name:	basesrc
Committed By:	tron
Date:		Sun Jul 16 21:00:28 UTC 2000

Update of /cvsroot/basesrc/usr.sbin/pppd
In directory nb00:/tmp/cvs-serv1198

Log Message:
Import the latest "pppd" 2.3.11 from Paul Mackerras.


Vendor Tag:	MACKERRAS
Release Tags:	PPP2_3_11
		
C basesrc/usr.sbin/pppd/chat/chat.8
C basesrc/usr.sbin/pppd/chat/chat.c
C basesrc/usr.sbin/pppd/pppd/auth.c
U basesrc/usr.sbin/pppd/pppd/cbcp.c
U basesrc/usr.sbin/pppd/pppd/cbcp.h
U basesrc/usr.sbin/pppd/pppd/ccp.c
U basesrc/usr.sbin/pppd/pppd/ccp.h
C basesrc/usr.sbin/pppd/pppd/chap.c
C basesrc/usr.sbin/pppd/pppd/chap.h
U basesrc/usr.sbin/pppd/pppd/chap_ms.c
U basesrc/usr.sbin/pppd/pppd/chap_ms.h
U basesrc/usr.sbin/pppd/pppd/demand.c
C basesrc/usr.sbin/pppd/pppd/eui64.c
C basesrc/usr.sbin/pppd/pppd/eui64.h
U basesrc/usr.sbin/pppd/pppd/fsm.c
C basesrc/usr.sbin/pppd/pppd/fsm.h
C basesrc/usr.sbin/pppd/pppd/ipcp.c
U basesrc/usr.sbin/pppd/pppd/ipcp.h
C basesrc/usr.sbin/pppd/pppd/ipv6cp.c
C basesrc/usr.sbin/pppd/pppd/ipv6cp.h
U basesrc/usr.sbin/pppd/pppd/ipxcp.c
U basesrc/usr.sbin/pppd/pppd/ipxcp.h
C basesrc/usr.sbin/pppd/pppd/lcp.c
U basesrc/usr.sbin/pppd/pppd/lcp.h
U basesrc/usr.sbin/pppd/pppd/magic.c
U basesrc/usr.sbin/pppd/pppd/magic.h
C basesrc/usr.sbin/pppd/pppd/main.c
C basesrc/usr.sbin/pppd/pppd/options.c
C basesrc/usr.sbin/pppd/pppd/patchlevel.h
C basesrc/usr.sbin/pppd/pppd/pathnames.h
C basesrc/usr.sbin/pppd/pppd/pppd.8
C basesrc/usr.sbin/pppd/pppd/pppd.h
U basesrc/usr.sbin/pppd/pppd/sys-bsd.c
C basesrc/usr.sbin/pppd/pppd/upap.c
C basesrc/usr.sbin/pppd/pppd/upap.h
C basesrc/usr.sbin/pppd/pppd/utils.c
U basesrc/usr.sbin/pppd/pppstats/pppstats.8
U basesrc/usr.sbin/pppd/pppstats/pppstats.c

21 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jMACKERRAS:yesterday -jMACKERRAS basesrc/usr.sbin/pppd