STABLE14-netbsd-pam-20050529

FIXES 18924

pam support for nbsd

(cherry picked from commit 985171769d01bfa8cd583e75c08d13949ac201fc)

diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index 05cd27cdff9cc8cdec551a47dc7ce959a6dd9e9b..4d5b0fd0a0a66d9429b7af1aa2811f493fc3a33e 100644 (file)
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -61,7 +61,7 @@ pam_afs.so.1: $(SHOBJS) afs_setcred.o afs_auth.o afs_util.o
        *linux*) \
                $(CC) $(LDFLAGS) -o $@ afs_setcred.o \
                        afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
-       *fbsd*) \
+       *fbsd*| *nbsd*) \
                $(CC) $(LDFLAGS) -o $@ afs_setcred.o \
                        afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
        * ) \
@@ -82,7 +82,7 @@ pam_afs.krb.so.1: $(SHOBJS) afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o
        *linux*) \
                $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o \
                        afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(KLIBS) ;;\
-       *fbsd*) \
+       *fbsd*| *nbsd*) \
                $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o \
                        afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(KLIBS) ;;\
        * ) \
@@ -98,7 +98,7 @@ test_pam: test_pam.o
                $(CC) $(CFLAGS) -o $@ test_pam.o ${PAM_LIBS};; \
        *linux*) \
                $(CC) $(CFLAGS) -rdynamic -o $@ test_pam.o -lpam -ldl;; \
-       *fbsd*) \
+       *fbsd*| *nbsd*) \
                $(CC) $(CFLAGS) -rdynamic -o $@ test_pam.o -lpam ;; \
        *) \
                echo No link line for system $(SYS_NAME). ;; \

diff --git a/src/pam/afs_auth.c b/src/pam/afs_auth.c
index 7fb77a3e502031a1aee2d7a34b980e4cc036bbd5..0a032586797b35739cf65a9f50ae672fef345a12 100644 (file)
--- a/src/pam/afs_auth.c
+++ b/src/pam/afs_auth.c
@@ -190,7 +190,7 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc,
        RET(PAM_AUTH_ERR);
     }
 #else
-#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
+#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_NBSD_ENV)
     upwd = getpwnam(user);
 #else
     upwd = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf));

diff --git a/src/pam/afs_password.c b/src/pam/afs_password.c
index 014b7566c7b9de79610e5ad453aa316f21ec8fd5..9fcfaa87b38992168e2daf71631a12a316d2e33d 100644 (file)
--- a/src/pam/afs_password.c
+++ b/src/pam/afs_password.c
@@ -134,7 +134,7 @@ pam_sm_chauthtok(pam_handle_t * pamh, int flags, int argc, const char **argv)
        RET(PAM_AUTH_ERR);
     }
 #else
-#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
+#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_NBSD_ENV)
     upwd = getpwnam(user);
 #else
     upwd = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf));

diff --git a/src/pam/afs_setcred.c b/src/pam/afs_setcred.c
index 5262f1c78c7a0ddee74fb0badb226b96fb627aef..e6713f3f004761d56a799846b5c9ae0ab6766596 100644 (file)
--- a/src/pam/afs_setcred.c
+++ b/src/pam/afs_setcred.c
@@ -170,7 +170,7 @@ pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv)
        RET(PAM_AUTH_ERR);
     }
 #else
-#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
+#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_NBSD_ENV)
     upwd = getpwnam(user);
 #else
     upwd = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf));

diff --git a/src/pam/test_pam.c b/src/pam/test_pam.c
index 44406a057a6b172030be13154a22520642d60842..39d35cb90f82b5ac63df4243526bfa49ceab7708 100644 (file)
--- a/src/pam/test_pam.c
+++ b/src/pam/test_pam.c
@@ -34,7 +34,7 @@ static const char *service = "afstest";
 static const char *new_envstring = "GOTHEREVIATESTPAM=1";
 static const char *new_homestring = "HOME=/tmp";
 
-#if defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_NBSD_ENV)
 #define getpassphrase getpass
 #endif