From e83a47e71a92bb5a6180e6c939bd5301c8c8412a Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Wed, 13 May 1998 05:49:22 +0000
Subject: [PATCH] Fix it so it compiles under RedHat 5.0 linux with glibc
 2.0.7. Fix some compile warnings.

---
 pppd/ipxcp.c     |  4 +++-
 pppd/lcp.c       | 16 +++++++++++++++-
 pppd/pppd.h      |  6 +++++-
 pppd/sys-linux.c |  3 ++-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/pppd/ipxcp.c b/pppd/ipxcp.c
index 0374910..dc64551 100644
--- a/pppd/ipxcp.c
+++ b/pppd/ipxcp.c
@@ -19,7 +19,7 @@
 
 #ifdef IPX_CHANGE
 #ifndef lint
-static char rcsid[] = "$Id: ipxcp.c,v 1.6 1998/03/25 03:08:16 paulus Exp $";
+static char rcsid[] = "$Id: ipxcp.c,v 1.7 1998/05/13 05:49:18 paulus Exp $";
 #endif
 
 /*
@@ -29,6 +29,7 @@ static char rcsid[] = "$Id: ipxcp.c,v 1.6 1998/03/25 03:08:16 paulus Exp $";
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -37,6 +38,7 @@ static char rcsid[] = "$Id: ipxcp.c,v 1.6 1998/03/25 03:08:16 paulus Exp $";
 #include "fsm.h"
 #include "ipxcp.h"
 #include "pathnames.h"
+#include "magic.h"
 
 /* global vars */
 ipxcp_options ipxcp_wantoptions[NUM_PPP];	/* Options that we want to request */
diff --git a/pppd/lcp.c b/pppd/lcp.c
index 0e00693..fef4da6 100644
--- a/pppd/lcp.c
+++ b/pppd/lcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: lcp.c,v 1.31 1997/11/27 06:08:44 paulus Exp $";
+static char rcsid[] = "$Id: lcp.c,v 1.32 1998/05/13 05:49:19 paulus Exp $";
 #endif
 
 /*
@@ -1620,6 +1620,20 @@ lcp_printpkt(p, plen, printer, arg)
 			break;
 		    case PPP_CHAP:
 			printer(arg, "chap");
+			if (p < optend) {
+			    switch (*p) {
+			    case CHAP_DIGEST_MD5:
+				printer(arg, " MD5");
+				++p;
+				break;
+#ifdef CHAPMS
+			    case CHAP_MICROSOFT:
+				printer(arg, " m$oft");
+				++p;
+				break;
+#endif
+			    }
+			}
 			break;
 		    default:
 			printer(arg, "0x%x", cishort);
diff --git a/pppd/pppd.h b/pppd/pppd.h
index 46b1f93..b021a9a 100644
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: pppd.h,v 1.21 1998/03/26 04:46:08 paulus Exp $
+ * $Id: pppd.h,v 1.22 1998/05/13 05:49:21 paulus Exp $
  */
 
 /*
@@ -303,6 +303,10 @@ int  get_host_seed __P((void));	/* Get host-dependent random number seed */
 int  set_filters __P((struct bpf_program *pass, struct bpf_program *active));
 				/* Set filter programs in kernel */
 #endif
+#ifdef IPX_CHANGE
+int  sipxfaddr __P((int, unsigned long, unsigned char *));
+int  cipxfaddr __P((int));
+#endif
 
 /* Procedures exported from options.c */
 int  parse_args __P((int argc, char **argv));
diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index 6d994a5..29aa77f 100644
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -51,11 +51,13 @@
 #endif
 
 #if __GLIBC__ >= 2
+#include <asm/types.h>		/* glibc 2 conflicts with linux/types.h */
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/route.h>
 #include <netinet/if_ether.h>
 #else
+#include <linux/types.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/route.h>
@@ -64,7 +66,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <linux/types.h>
 #include <linux/ppp_defs.h>
 #include <linux/if_ppp.h>
 
-- 
2.39.2