diff -ruN ppp-2.4.0/pppd/plugins/pppoatm.c ppp-2.4.0-patched/pppd/plugins/pppoatm.c --- ppp-2.4.0/pppd/plugins/pppoatm.c Sun Apr 1 21:21:24 2001 +++ ppp-2.4.0-patched/pppd/plugins/pppoatm.c Sun Jan 6 16:12:10 2002 @@ -16,7 +16,7 @@ #include #include #include -#include +#include /* #include */ #include static struct sockaddr_atmpvc pvcaddr; diff -ruN ppp-2.4.0/pppd/plugins/pppoe/Makefile.linux ppp-2.4.0-patched/pppd/plugins/pppoe/Makefile.linux --- ppp-2.4.0/pppd/plugins/pppoe/Makefile.linux Sun Apr 1 21:21:24 2001 +++ ppp-2.4.0-patched/pppd/plugins/pppoe/Makefile.linux Sun Jan 6 16:26:06 2002 @@ -2,7 +2,8 @@ CFLAGS = -g -I.. -I../.. -I../../../include -D_linux_=1 -fPIC LDFLAGS = -shared -all: pppoe.so pppoed +all: +# pppoe.so pppoed PLUGINDIR = $(LIBDIR)/plugins diff -ruN ppp-2.4.0/pppd/plugins/pppoe/pppoe.c ppp-2.4.0-patched/pppd/plugins/pppoe/pppoe.c --- ppp-2.4.0/pppd/plugins/pppoe/pppoe.c Sun Apr 1 21:21:24 2001 +++ ppp-2.4.0-patched/pppd/plugins/pppoe/pppoe.c Sun Jan 6 16:24:32 2002 @@ -11,7 +11,7 @@ * 2 of the License, or (at your option) any later version. */ -#include +#include #include #include #include diff -ruN ppp-2.4.0/pppd/plugins/pppoe/pppoe.h ppp-2.4.0-patched/pppd/plugins/pppoe/pppoe.h --- ppp-2.4.0/pppd/plugins/pppoe/pppoe.h Sun Apr 1 21:21:24 2001 +++ ppp-2.4.0-patched/pppd/plugins/pppoe/pppoe.h Sun Jan 6 16:12:50 2002 @@ -30,8 +30,8 @@ #include /* ioctl() */ #include #include /* socket() */ -#include /* ifreq struct */ -#include +#include /* ifreq struct */ +#include #include #if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 diff -ruN ppp-2.4.0/pppd/sys-linux.c ppp-2.4.0-patched/pppd/sys-linux.c --- ppp-2.4.0/pppd/sys-linux.c Sun Apr 1 21:21:24 2001 +++ ppp-2.4.0-patched/pppd/sys-linux.c Sun Jan 6 18:30:14 2002 @@ -51,7 +51,7 @@ #define MAX_ADDR_LEN 7 #endif -#if __GLIBC__ >= 2 +#if 0 /* __GLIBC__ >= 2 */ #include /* glibc 2 conflicts with linux/types.h */ #include #include @@ -142,7 +142,7 @@ static int restore_term = 0; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ -int new_style_driver = 0; +int new_style_driver = 1; /* sunZZZZZZZZZZZ */ static char loop_name[20]; static unsigned char inbuf[512]; /* buffer for chars read from loopback */ @@ -2235,6 +2235,7 @@ * Add the device route */ if (kernel_version < KVERSION(2,1,16)) { + /* SET_SA_FAMILY (rt.rt_dst, AF_INET); SET_SA_FAMILY (rt.rt_gateway, AF_INET); rt.rt_dev = ifname; @@ -2253,6 +2254,7 @@ error("ioctl(SIOCADDRT) device route: %m(%d)", errno); return (0); } + */ } /* set ip_dynaddr in demand mode if address changes */ @@ -2289,6 +2291,7 @@ /* * Delete the route through the device */ + /* sunZZ struct rtentry rt; memset (&rt, '\0', sizeof (rt)); @@ -2310,6 +2313,7 @@ error("ioctl(SIOCDELRT) device route: %m(%d)", errno); return (0); } + */ } /* This way it is possible to have an IPX-only or IPv6-only interface */