From: Eivind Næss <eivnaes@yahoo.com>
Date: Tue, 31 May 2022 03:50:55 +0000 (-0700)
Subject: The use of <net/ppp_defs.h> isn't guranteed to exist on Linux (e.g. uclibc, buildroot... 
X-Git-Tag: ppp-2.5.0~36^2~2
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=509f04959ad891d7f981f035ed461d51bd1f74b0

The use of <net/ppp_defs.h> isn't guranteed to exist on Linux (e.g. uclibc, buildroot, others)

The one provided by glibc simply includes <linux/ppp_defs.h>. This include is still needed on SunOS

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---

diff --git a/pppd/ccp.c b/pppd/ccp.c
index cfe94f8..088a163 100644
--- a/pppd/ccp.c
+++ b/pppd/ccp.c
@@ -36,11 +36,15 @@
 
 #include <stdlib.h>
 #include <string.h>
+#if defined(SOL2)
+#include <net/ppp-comp.h>
+#else
+#include <linux/ppp-comp.h>
+#endif
 
 #include "pppd.h"
 #include "fsm.h"
 #include "ccp.h"
-#include <net/ppp-comp.h>
 
 #include "chap_ms.h"
 #include "mppe.h"
diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c
index e7e8cba..8e59280 100644
--- a/pppd/chap_ms.c
+++ b/pppd/chap_ms.c
@@ -87,6 +87,11 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>
+#if defined(SOL2)
+#include <net/ppp-comp.h>
+#else
+#include <linux/ppp-comp.h>
+#endif
 
 #include "pppd.h"
 #include "chap-new.h"
@@ -130,7 +135,6 @@ static char *mschap2_peer_challenge = NULL;
 
 #include "fsm.h"		/* Need to poke MPPE options */
 #include "ccp.h"
-#include <net/ppp-comp.h>
 #endif
 
 /*
diff --git a/pppd/peap.c b/pppd/peap.c
index 414fa11..d6e5fcf 100644
--- a/pppd/peap.c
+++ b/pppd/peap.c
@@ -56,7 +56,6 @@
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
-#include <net/ppp_defs.h>
 
 #include "pppd.h"
 #include "eap.h"
diff --git a/pppd/pppd.h b/pppd/pppd.h
index d7b431d..e59e0e5 100644
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -53,7 +53,11 @@
 #include <stdarg.h>
 #include <stdint.h>
 #include <sys/types.h>		/* for u_int32_t, if defined */
+#if defined(SOL2)
 #include <net/ppp_defs.h>
+#else
+#include <linux/ppp_defs.h>
+#endif
 
 #ifdef PPP_WITH_IPV6CP
 #if defined(SOL2)
diff --git a/pppd/sha1.c b/pppd/sha1.c
index efb37be..4fc5345 100644
--- a/pppd/sha1.c
+++ b/pppd/sha1.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <time.h>
 #include <netinet/in.h>	/* htonl() */
-#include <net/ppp_defs.h>
 #include "sha1.h"
 
 static void
diff --git a/pppdump/bsd-comp.c b/pppdump/bsd-comp.c
index 7ad6289..57f936c 100644
--- a/pppdump/bsd-comp.c
+++ b/pppdump/bsd-comp.c
@@ -46,7 +46,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <net/ppp_defs.h>
 
 #include "ppp-comp.h"
 
diff --git a/pppdump/deflate.c b/pppdump/deflate.c
index 0f090b2..ebc1692 100644
--- a/pppdump/deflate.c
+++ b/pppdump/deflate.c
@@ -41,7 +41,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <net/ppp_defs.h>
 
 #include "ppp-comp.h"
 #include "zlib.h"
diff --git a/pppdump/ppp-comp.h b/pppdump/ppp-comp.h
index 4046a1f..0199b5f 100644
--- a/pppdump/ppp-comp.h
+++ b/pppdump/ppp-comp.h
@@ -51,6 +51,12 @@
 #define DO_PREDICTOR_1	0
 #define DO_PREDICTOR_2	0
 
+#if defined(SOL2)
+#include <net/ppp_defs.h>
+#else
+#include <linux/ppp_defs.h>
+#endif
+
 /*
  * Structure giving methods for compression/decompression.
  */
diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c
index 8944ca5..2b815fc 100644
--- a/pppdump/pppdump.c
+++ b/pppdump/pppdump.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <sys/types.h>
-#include <net/ppp_defs.h>
+
 #include "ppp-comp.h"
 
 int hexmode;