From f36f5f83a39058e3cd16d450f20d20fa32419076 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Eivind=20N=C3=A6ss?= Date: Sat, 7 Aug 2021 14:52:39 -0700 Subject: [PATCH] Changing USE_PAM to PPP_WITH_PAM for consistency. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eivind Næss --- configure.ac | 4 ++-- pppd/Makefile.am | 6 ++++-- pppd/pppdconf.h.in | 6 +++--- pppd/session.c | 26 +++++++++++++------------- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 19e981c..1248b84 100644 --- a/configure.ac +++ b/configure.ac @@ -275,8 +275,8 @@ AX_CHECK_ATM # # With libpam support -AX_CHECK_PAM(AC_DEFINE([USE_PAM], 1, ["Support for Pluggable Authentication Modules"])) -AM_CONDITIONAL(WITH_PAM, test "x${with_pam}" = "xyes") +AX_CHECK_PAM(AC_DEFINE([PPP_WITH_PAM], 1, [Support for Pluggable Authentication Modules])) +AM_CONDITIONAL(PPP_WITH_PAM, test "x${with_pam}" = "xyes") # # With libpcap support, activate pppd on network activity diff --git a/pppd/Makefile.am b/pppd/Makefile.am index a7d64cf..c3f512f 100644 --- a/pppd/Makefile.am +++ b/pppd/Makefile.am @@ -127,8 +127,10 @@ if PPP_WITH_IPV6CP pppd_SOURCES += ipv6cp.c eui64.c endif -if WITH_PAM -pppd_LIBS += -lpam -ldl +if PPP_WITH_PAM +pppd_CPPFLAGS += $(PAM_CFLAGS) +pppd_LIBS += $(PAM_LIBS) -ldl +pppd_LDFLAGS += $(PAM_LDFLAGS) endif if PPP_WITH_EAPTLS diff --git a/pppd/pppdconf.h.in b/pppd/pppdconf.h.in index 0b46a1e..d12dc82 100644 --- a/pppd/pppdconf.h.in +++ b/pppd/pppdconf.h.in @@ -33,10 +33,10 @@ /* "Have IPv6 support" */ #undef PPP_WITH_IPV6CP -/* "Support for Pluggable Authentication Modules" */ -#undef USE_PAM +/* Support for Pluggable Authentication Modules */ +#undef PPP_WITH_PAM -/* "Have EAP-SRP authentication support" */ +/* Have EAP-SRP authentication support */ #undef USE_SRP /* Have EAP-TLS authentication support */ diff --git a/pppd/session.c b/pppd/session.c index 3d1fb6d..8ab5b8b 100644 --- a/pppd/session.c +++ b/pppd/session.c @@ -92,9 +92,9 @@ #include "pppd.h" #include "session.h" -#ifdef USE_PAM +#ifdef PPP_WITH_PAM #include -#endif /* #ifdef USE_PAM */ +#endif /* #ifdef PPP_WITH_PAM */ #define SET_MSG(var, msg) if (var != NULL) { var[0] = msg; } #define COPY_STRING(s) ((s) ? strdup(s) : NULL) @@ -109,7 +109,7 @@ /* We have successfully started a session */ static bool logged_in = 0; -#ifdef USE_PAM +#ifdef PPP_WITH_PAM /* * Static variables used to communicate between the conversation function * and the server_login function @@ -167,17 +167,17 @@ static struct pam_conv pam_conv_data = { &conversation, NULL }; -#endif /* #ifdef USE_PAM */ +#endif /* #ifdef PPP_WITH_PAM */ int session_start(const int flags, const char *user, const char *passwd, const char *ttyName, char **msg) { -#ifdef USE_PAM +#ifdef PPP_WITH_PAM bool ok = 1; const char *usr; int pam_error; bool try_session = 0; -#else /* #ifdef USE_PAM */ +#else /* #ifdef PPP_WITH_PAM */ struct passwd *pw; char *cbuf; #ifdef HAVE_SHADOW_H @@ -185,7 +185,7 @@ session_start(const int flags, const char *user, const char *passwd, const char struct spwd *getspnam(); long now = 0; #endif /* #ifdef HAVE_SHADOW_H */ -#endif /* #ifdef USE_PAM */ +#endif /* #ifdef PPP_WITH_PAM */ SET_MSG(msg, SUCCESS_MSG); @@ -199,7 +199,7 @@ session_start(const int flags, const char *user, const char *passwd, const char return SESSION_FAILED; } -#ifdef USE_PAM +#ifdef PPP_WITH_PAM /* Find the '\\' in the username */ /* This needs to be fixed to support different username schemes */ if ((usr = strchr(user, '\\')) == NULL) @@ -295,7 +295,7 @@ session_start(const int flags, const char *user, const char *passwd, const char /* If our PAM checks have already failed, then we must return a failure */ if (!ok) return SESSION_FAILED; -#else /* #ifdef USE_PAM */ +#else /* #ifdef PPP_WITH_PAM */ /* * Use the non-PAM methods directly. 'pw' will remain NULL if the user @@ -359,7 +359,7 @@ session_start(const int flags, const char *user, const char *passwd, const char return SESSION_FAILED; } -#endif /* #ifdef USE_PAM */ +#endif /* #ifdef PPP_WITH_PAM */ /* * Write a wtmp entry for this user. @@ -371,7 +371,7 @@ session_start(const int flags, const char *user, const char *passwd, const char logwtmp(ttyName, user, ifname); /* Add wtmp login entry */ logged_in = 1; -#if defined(_PATH_LASTLOG) && !defined(USE_PAM) +#if defined(_PATH_LASTLOG) && !defined(PPP_WITH_PAM) /* * Enter the user in lastlog only if he has been authenticated using * local system services. If he has not, then we don't know what his @@ -393,7 +393,7 @@ session_start(const int flags, const char *user, const char *passwd, const char (void)close(fd); } } -#endif /* _PATH_LASTLOG and not USE_PAM */ +#endif /* _PATH_LASTLOG and not PPP_WITH_PAM */ info("user %s logged in on tty %s intf %s", user, ttyName, ifname); } @@ -406,7 +406,7 @@ session_start(const int flags, const char *user, const char *passwd, const char void session_end(const char* ttyName) { -#ifdef USE_PAM +#ifdef PPP_WITH_PAM int pam_error = PAM_SUCCESS; if (pamh != NULL) { -- 2.39.2