Module Name:	basesrc
Committed By:	christos
Date:		Sat Sep 23 22:39:41 UTC 2000

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

Log Message:
- resolve conflicts
- adjust 2.4.0 new tty subsystem back to bsd.
- start on multilink stubs
- clean up warnings

- paulus knows about the fixes, but he has not responded yet as to if
  I should commit them or not].
- I've tested ipv4 connectivity and itojun tested ipv6 [many thanks!]
- Missing from this are pluggin examples and pppdump code because they
  are contain gpl code.
- This version of pppd is again gpl free now!


To generate a diff of this commit:
cvs rdiff -r1.17 -r1.18 basesrc/usr.sbin/pppd/Makefile
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/pppd/Makefile.inc
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/pppd/chat/Makefile
cvs rdiff -r1.19 -r1.20 basesrc/usr.sbin/pppd/chat/chat.c
cvs rdiff -r1.27 -r1.28 basesrc/usr.sbin/pppd/pppd/Makefile
cvs rdiff -r1.26 -r1.27 basesrc/usr.sbin/pppd/pppd/auth.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/pppd/pppd/cbcp.c \
    basesrc/usr.sbin/pppd/pppd/chap_ms.h basesrc/usr.sbin/pppd/pppd/magic.h
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/pppd/pppd/cbcp.h \
    basesrc/usr.sbin/pppd/pppd/eui64.c basesrc/usr.sbin/pppd/pppd/eui64.h \
    basesrc/usr.sbin/pppd/pppd/ipv6cp.h
cvs rdiff -r1.10 -r1.11 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.6 -r1.7 basesrc/usr.sbin/pppd/pppd/ccp.h
cvs rdiff -r1.15 -r1.16 basesrc/usr.sbin/pppd/pppd/chap.c
cvs rdiff -r1.9 -r1.10 basesrc/usr.sbin/pppd/pppd/chap.h \
    basesrc/usr.sbin/pppd/pppd/demand.c basesrc/usr.sbin/pppd/pppd/fsm.h \
    basesrc/usr.sbin/pppd/pppd/upap.h
cvs rdiff -r1.12 -r1.13 basesrc/usr.sbin/pppd/pppd/fsm.c \
    basesrc/usr.sbin/pppd/pppd/ipcp.h basesrc/usr.sbin/pppd/pppd/pathnames.h \
    basesrc/usr.sbin/pppd/pppd/upap.c
cvs rdiff -r1.19 -r1.20 basesrc/usr.sbin/pppd/pppd/ipcp.c \
    basesrc/usr.sbin/pppd/pppd/patchlevel.h
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/pppd/pppd/ipv6cp.c \
    basesrc/usr.sbin/pppd/pppd/magic.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/pppd/pppd/ipxcp.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/pppd/pppd/ipxcp.h \
    basesrc/usr.sbin/pppd/pppd/utils.c
cvs rdiff -r1.21 -r1.22 basesrc/usr.sbin/pppd/pppd/lcp.c
cvs rdiff -r1.36 -r1.37 basesrc/usr.sbin/pppd/pppd/main.c
cvs rdiff -r1.32 -r1.33 basesrc/usr.sbin/pppd/pppd/options.c
cvs rdiff -r1.29 -r1.30 basesrc/usr.sbin/pppd/pppd/pppd.8
cvs rdiff -r1.20 -r1.21 basesrc/usr.sbin/pppd/pppd/pppd.h
cvs rdiff -r1.34 -r1.35 basesrc/usr.sbin/pppd/pppd/sys-bsd.c
cvs rdiff -r1.1.1.1 -r1.2 basesrc/usr.sbin/pppd/pppd/tdb.c
cvs rdiff -r1.14 -r1.15 basesrc/usr.sbin/pppd/pppstats/Makefile
cvs rdiff -r1.12 -r1.13 basesrc/usr.sbin/pppd/pppstats/pppstats.8
cvs rdiff -r1.23 -r1.24 basesrc/usr.sbin/pppd/pppstats/pppstats.c

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