From 3604f5c7d9c671dd8a59c8adab14c8f4edd9503e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
Date: Fri, 6 Aug 2021 16:37:10 -0700
Subject: [PATCH] Changing CBCP_SUPPORT define to PPP_WITH_CBCP to be
 consistent.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---
 configure.ac       | 8 ++++----
 pppd/Makefile.am   | 2 +-
 pppd/auth.c        | 4 ++--
 pppd/main.c        | 4 ++--
 pppd/pppdconf.h.in | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 65e2054..04e0940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,9 +110,9 @@ AM_COND_IF([WITH_SYSTEMD],
 # Enable Callback Protocol Support, disabled by default
 AC_ARG_ENABLE([cbcp],
     AS_HELP_STRING([--enable-cbcp], [Enable Callback Protocol]))
-AM_CONDITIONAL(WITH_CBCP, test "x${enable_cbcp}" = "xyes")
-AM_COND_IF([WITH_CBCP],
-    AC_DEFINE([CBCP_SUPPORT], 1, [Have Callback Protocol support]))
+AM_CONDITIONAL(PPP_WITH_CBCP, test "x${enable_cbcp}" = "xyes")
+AM_COND_IF([PPP_WITH_CBCP],
+    AC_DEFINE([PPP_WITH_CBCP], 1, [Have Callback Protocol support]))
 
 #
 # Disable support for limiting session duration by maximum octets
@@ -155,7 +155,7 @@ AC_ARG_ENABLE([multilink],
     AS_HELP_STRING([--enable-multilink], [Enable multilink support]))
 AM_CONDITIONAL(PPP_WITH_MULTILINK, test "x${enable_multilink}" = "xyes")
 AM_COND_IF([PPP_WITH_MULTILINK],
-    AC_DEFINE([PPP_WITH__MULTILINK], 1, ["Have multilink support"]))
+    AC_DEFINE([PPP_WITH_MULTILINK], 1, ["Have multilink support"]))
 AS_IF([test "x${build_sunos}" = "xyes" && test "x${enable_multilink}" = "xyes"],
     [AC_MSG_ERROR([Multilink is not supported on SunOS])])
 
diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index f06c46d..738613d 100644
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -93,7 +93,7 @@ pppd_SOURCES += pppcrypt.c
 endif
 endif
 
-if WITH_CBCP
+if PPP_WITH_CBCP
 pppd_SOURCES += cbcp.c
 endif
 
diff --git a/pppd/auth.c b/pppd/auth.c
index 7ce6baf..c6e2344 100644
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -125,7 +125,7 @@
 #ifdef USE_EAPTLS
 #include "eap-tls.h"
 #endif
-#ifdef CBCP_SUPPORT
+#ifdef PPP_WITH_CBCP
 #include "cbcp.h"
 #endif
 #include "pathnames.h"
@@ -906,7 +906,7 @@ network_phase(int unit)
 	}
     }
 
-#ifdef CBCP_SUPPORT
+#ifdef PPP_WITH_CBCP
     /*
      * If we negotiated callback, do it now.
      */
diff --git a/pppd/main.c b/pppd/main.c
index dbf22ec..84a58c4 100644
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -113,7 +113,7 @@
 #include "tdb.h"
 #endif
 
-#ifdef CBCP_SUPPORT
+#ifdef PPP_WITH_CBCP
 #include "cbcp.h"
 #endif
 
@@ -268,7 +268,7 @@ struct protent *protocols[] = {
     &lcp_protent,
     &pap_protent,
     &chap_protent,
-#ifdef CBCP_SUPPORT
+#ifdef PPP_WITH_CBCP
     &cbcp_protent,
 #endif
     &ipcp_protent,
diff --git a/pppd/pppdconf.h.in b/pppd/pppdconf.h.in
index b607c6c..eeabcf4 100644
--- a/pppd/pppdconf.h.in
+++ b/pppd/pppdconf.h.in
@@ -25,7 +25,7 @@
 #undef MAXOCTETS
 
 /* Have Microsoft Callback Protocol support */
-#undef CBCP_SUPPORT
+#undef PPP_WITH_CBCP
 
 /* "Include Trivial Database support" */
 #undef PPP_WITH_TDB
-- 
2.39.2