From 11febba74597dc22b1f2611db14537e3e81a11bc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
Date: Thu, 9 Mar 2023 23:59:19 +0000
Subject: [PATCH] Additional fixes for broken build
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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>
---
 pppd/options.c               | 6 +++++-
 pppd/plugins/radius/radius.c | 2 +-
 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>
 
-- 
2.39.2