summaryrefslogtreecommitdiff
path: root/pppd
diff options
context:
space:
mode:
authorEivind Næss <eivnaes@yahoo.com>2021-08-06 16:37:10 -0700
committerEivind Næss <eivnaes@yahoo.com>2022-07-15 15:25:39 -0700
commit3604f5c7d9c671dd8a59c8adab14c8f4edd9503e (patch)
tree3b6c0442987559740fa25efddf678d72ead13e77 /pppd
parent02e3fbaedc1c7ab8bcf5a6599dbf4db3998b9371 (diff)
downloadppp-3604f5c7d9c671dd8a59c8adab14c8f4edd9503e.tar.gz
Changing CBCP_SUPPORT define to PPP_WITH_CBCP to be consistent.
Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
Diffstat (limited to 'pppd')
-rw-r--r--pppd/Makefile.am2
-rw-r--r--pppd/auth.c4
-rw-r--r--pppd/main.c4
-rw-r--r--pppd/pppdconf.h.in2
4 files changed, 6 insertions, 6 deletions
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