summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEivind Næss <eivnaes@yahoo.com>2023-03-09 23:59:19 +0000
committerEivind Næss <eivnaes@yahoo.com>2023-03-17 14:17:41 +0000
commit11febba74597dc22b1f2611db14537e3e81a11bc (patch)
tree65fe5a2c511eb5a91a4da9c0e6f063ce2499af35
parent1fe5196b10fc30b1dfb8b4b0ac5bf2b6fa49c297 (diff)
downloadppp-11febba74597dc22b1f2611db14537e3e81a11bc.tar.gz
Additional fixes for broken build
This change fixes the build when - ./configure is run with --disable-plugins - ./configure is run with --disable-peap --disable-eaptls --disable-microsoft-extensions The latter disables the MPPE encryption too, but <pppd/crypto.h> is still needed. Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
-rw-r--r--pppd/options.c6
-rw-r--r--pppd/plugins/radius/radius.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/pppd/options.c b/pppd/options.c
index 214adae..42e39b8 100644
--- a/pppd/options.c
+++ b/pppd/options.c
@@ -452,9 +452,11 @@ ppp_get_path(ppp_path_t type, char *buf, size_t bufsz)
case PPP_DIR_RUNTIME:
path = PPP_PATH_VARRUN;
break;
+#ifdef PPP_WITH_PLUGINS
case PPP_DIR_PLUGIN:
path = PPP_PATH_PLUGIN;
break;
+#endif
case PPP_DIR_CONF:
path = PPP_PATH_CONFDIR;
break;
@@ -477,10 +479,12 @@ ppp_get_filepath(ppp_path_t type, const char *name, char *buf, size_t bufsz)
case PPP_DIR_RUNTIME:
path = PPP_PATH_VARRUN;
break;
+#ifdef PPP_WITH_PLUGINS
case PPP_DIR_PLUGIN:
path = PPP_PATH_PLUGIN;
break;
- case PPP_DIR_CONF:
+#endif
+ case PPP_DIR_CONF:
path = PPP_PATH_CONFDIR;
break;
}
diff --git a/pppd/plugins/radius/radius.c b/pppd/plugins/radius/radius.c
index 11cf27c..c73ca0b 100644
--- a/pppd/plugins/radius/radius.c
+++ b/pppd/plugins/radius/radius.c
@@ -44,9 +44,9 @@ static char const RCSID[] =
#include <pppd/chap_ms.h>
#ifdef PPP_WITH_MPPE
#include <pppd/mppe.h>
-#include <pppd/crypto.h>
#endif
#endif
+#include <pppd/crypto.h>
#include <pppd/fsm.h>
#include <pppd/ipcp.h>