Module Name: src
Committed By: martin
Date: Thu Jan 9 18:27:46 UTC 2025
Modified Files:
src/external/bsd/ppp/dist/pppd: session.c
src/external/bsd/ppp/include: config.h pppdconf.h
Log Message:
Fix USE_PAM conditionals
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ppp/dist/pppd/session.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/include/config.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/include/pppdconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ppp/dist/pppd/session.c
diff -u src/external/bsd/ppp/dist/pppd/session.c:1.6 src/external/bsd/ppp/dist/pppd/session.c:1.7
--- src/external/bsd/ppp/dist/pppd/session.c:1.6 Wed Jan 8 19:59:39 2025
+++ src/external/bsd/ppp/dist/pppd/session.c Thu Jan 9 18:27:46 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: session.c,v 1.6 2025/01/08 19:59:39 christos Exp $ */
+/* $NetBSD: session.c,v 1.7 2025/01/09 18:27:46 martin Exp $ */
/*
* session.c - PPP session control.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: session.c,v 1.6 2025/01/08 19:59:39 christos Exp $");
+__RCSID("$NetBSD: session.c,v 1.7 2025/01/09 18:27:46 martin Exp $");
#ifdef HAVE_CONFIG_H
@@ -191,7 +191,9 @@ session_start(const int flags, const cha
bool try_session = 0;
#else /* #ifdef PPP_WITH_PAM */
struct passwd *pw;
+#ifdef HAVE_CRYPT_H
char *cbuf;
+#endif
#ifdef HAVE_SHADOW_H
struct spwd *spwd;
struct spwd *getspnam();
Index: src/external/bsd/ppp/include/config.h
diff -u src/external/bsd/ppp/include/config.h:1.1 src/external/bsd/ppp/include/config.h:1.2
--- src/external/bsd/ppp/include/config.h:1.1 Wed Jan 8 19:59:40 2025
+++ src/external/bsd/ppp/include/config.h Thu Jan 9 18:27:46 2025
@@ -188,7 +188,11 @@
#define PPP_WITH_OPENSSL 1
/* Support for Pluggable Authentication Modules */
+#ifdef USE_PAM
#define PPP_WITH_PAM 1
+#else
+#undef PPP_WITH_PAM
+#endif
/* Have PEAP authentication support */
#define PPP_WITH_PEAP 1
Index: src/external/bsd/ppp/include/pppdconf.h
diff -u src/external/bsd/ppp/include/pppdconf.h:1.2 src/external/bsd/ppp/include/pppdconf.h:1.3
--- src/external/bsd/ppp/include/pppdconf.h:1.2 Wed Jan 8 20:00:41 2025
+++ src/external/bsd/ppp/include/pppdconf.h Thu Jan 9 18:27:46 2025
@@ -65,7 +65,11 @@
#endif
/* Support for Pluggable Authentication Modules */
+#ifdef USE_PAM
#define PPP_WITH_PAM 1
+#else
+#undef PPP_WITH_PAM
+#endif
/* Have EAP-SRP authentication support */
/* #undef PPP_WITH_SRP */
