lists.arthurdejong.org
RSS feed

nss-pam-ldapd branch master updated. 0.9.13-9-g30aba46

[Date Prev][Date Next] [Thread Prev][Thread Next]

nss-pam-ldapd branch master updated. 0.9.13-9-g30aba46



This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nss-pam-ldapd".

The branch, master has been updated
       via  30aba46d295b55364bebf6a3b99026e0f01e7e7c (commit)
      from  5fd15cc6f940149d9596a215cbc9429e2c02bae7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=30aba46d295b55364bebf6a3b99026e0f01e7e7c

commit 30aba46d295b55364bebf6a3b99026e0f01e7e7c
Author: Anya Shanahan <codedev@neverten.org>
Date:   Thu Oct 8 16:48:40 2026 +0100

    Fix multithreaded use of PAM module
    
    This corrects the guard variable used to check for the existance of the
    pam_modutil_getpwnam() function.
    
    Closes https://github.com/arthurdejong/nss-pam-ldapd/pull/87
    Closes https://github.com/arthurdejong/nss-pam-ldapd/issues/86

diff --git a/compat/pam_compat.h b/compat/pam_compat.h
index 31a2497..d4995ee 100644
--- a/compat/pam_compat.h
+++ b/compat/pam_compat.h
@@ -70,12 +70,12 @@ int pam_prompt(pam_handle_t *pamh, int style, char 
**response,
 #endif /* not HAVE_DECL_PAM_ERROR */
 
 /* fall back to using getpwnam() if pam_modutil_getpwnam() isn't defined */
-#ifndef HAVE_PAM_MODUTIL_GETGWNAM
+#ifndef HAVE_PAM_MODUTIL_GETPWNAM
 #include <sys/types.h>
 #include <pwd.h>
 #define pam_modutil_getpwnam(pamh, user)                                    \
   getpwnam(user)
-#endif /* not HAVE_PAM_MODUTIL_GETGWNAM */
+#endif /* not HAVE_PAM_MODUTIL_GETPWNAM */
 
 /* fall back to using syslog() if pam_syslog() doesn't exist */
 #ifndef HAVE_PAM_SYSLOG
diff --git a/pam/pam.c b/pam/pam.c
index bbd17cc..2022911 100644
--- a/pam/pam.c
+++ b/pam/pam.c
@@ -212,7 +212,7 @@ static int init(pam_handle_t *pamh, struct pld_cfg *cfg, 
struct pld_ctx **ctx,
   /* check uid */
   if (cfg->minimum_uid > 0)
   {
-    pwent = pam_modutil_getpwnam(args->pamh, *username);
+    pwent = pam_modutil_getpwnam(pamh, *username);
     if ((pwent != NULL) && (pwent->pw_uid < cfg->minimum_uid))
     {
       if (cfg->debug)
@@ -690,7 +690,7 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
     ctx->asroot = 0;
     /* see if the user is trying to modify another user's password */
     /* TODO: perhaps this can be combined with the nslcd_request_exists() call 
above */
-    pwent = pam_modutil_getpwnam(args->pamh, username);
+    pwent = pam_modutil_getpwnam(pamh, username);
     myuid = getuid();
     if ((pwent != NULL) && (pwent->pw_uid != myuid) && (!(flags & 
PAM_CHANGE_EXPIRED_AUTHTOK)))
     {

-----------------------------------------------------------------------

Summary of changes:
 compat/pam_compat.h | 4 ++--
 pam/pam.c           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
nss-pam-ldapd