christos
Wed Mar 12 14:38:46 EST 1997
Update of /a/cvsroot/src/usr.sbin/pppd
In directory netbsd1:/var/slash-tmp/cvs-serv24298

Log Message:
Import the latest pppd from Paul Mackerras.

Status:

Vendor Tag:	MACKERRAS
Release Tags:	PPP2_3B4
		
C src/usr.sbin/pppd/sys-bsd.c
C src/usr.sbin/pppd/Makefile
C src/usr.sbin/pppd/auth.c
N src/usr.sbin/pppd/cbcp.c
N src/usr.sbin/pppd/cbcp.h
C src/usr.sbin/pppd/ccp.c
C src/usr.sbin/pppd/ccp.h
C src/usr.sbin/pppd/chap.c
C src/usr.sbin/pppd/chap.h
N src/usr.sbin/pppd/chap_ms.c
N src/usr.sbin/pppd/chap_ms.h
C src/usr.sbin/pppd/demand.c
C src/usr.sbin/pppd/fsm.c
C src/usr.sbin/pppd/fsm.h
C src/usr.sbin/pppd/ipcp.c
C src/usr.sbin/pppd/ipcp.h
N src/usr.sbin/pppd/ipxcp.c
N src/usr.sbin/pppd/ipxcp.h
C src/usr.sbin/pppd/lcp.c
C src/usr.sbin/pppd/lcp.h
C src/usr.sbin/pppd/magic.c
C src/usr.sbin/pppd/magic.h
C src/usr.sbin/pppd/main.c
C src/usr.sbin/pppd/options.c
C src/usr.sbin/pppd/patchlevel.h
C src/usr.sbin/pppd/pathnames.h
C src/usr.sbin/pppd/pppd.8
N src/usr.sbin/pppd/pppd.cbcp.8
C src/usr.sbin/pppd/pppd.h
C src/usr.sbin/pppd/upap.c
C src/usr.sbin/pppd/upap.h
C src/usr.sbin/pppd/chat/Makefile
C src/usr.sbin/pppd/chat/chat.8
C src/usr.sbin/pppd/chat/chat.c
C src/usr.sbin/pppd/pppstats/Makefile
C src/usr.sbin/pppd/pppstats/pppstats.8
C src/usr.sbin/pppd/pppstats/pppstats.c

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

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