From ffb77b32f065abac744d25aed59037e91c985af8 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Wed, 19 Jul 2006 22:17:17 +0000 Subject: [PATCH] DEVEL15-aix5-curpag-20060719 curpag() exists in too many places anyway, fix em (cherry picked from commit 72abe41e1df0e530ae73e50b0b952b26d4e26683) --- src/auth/ktc.c | 8 ++++++++ src/pam/afs_util.c | 8 ++++++++ src/sys/pagsh.c | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/src/auth/ktc.c b/src/auth/ktc.c index 7b6bac4fb..d4564721d 100644 --- a/src/auth/ktc.c +++ b/src/auth/ktc.c @@ -1612,6 +1612,13 @@ afs_tf_dest_tkt() static afs_uint32 curpag() { +#if defined(AFS_AIX51_ENV) + afs_int32 pag; + + if (kcred_getpag(cred, PAG_AFS, &pag) < 0 || pag == 0) + pag = NOPAG; + return pag; +#else gid_t groups[NGROUPS_MAX]; afs_uint32 g0, g1; afs_uint32 h, l, ret; @@ -1635,6 +1642,7 @@ curpag() return -1; } return -1; +#endif } diff --git a/src/pam/afs_util.c b/src/pam/afs_util.c index e98618e7c..5c4d4cfcb 100644 --- a/src/pam/afs_util.c +++ b/src/pam/afs_util.c @@ -180,6 +180,13 @@ do_klog(const char *user, const char *password, const char *lifetime, static afs_int32 curpag(void) { +#if defined(AFS_AIX51_ENV) + afs_int32 pag; + + if (kcred_getpag(cred, PAG_AFS, &pag) < 0 || pag == 0) + pag = NOPAG; + return pag; +#else gid_t groups[NGROUPS_MAX]; afs_uint32 g0, g1; afs_uint32 h, l, ret; @@ -203,6 +210,7 @@ curpag(void) return -1; } return -1; +#endif } /* Returns the AFS pag number, if any, otherwise return -1 */ diff --git a/src/sys/pagsh.c b/src/sys/pagsh.c index fcdbcc186..ee04cc559 100644 --- a/src/sys/pagsh.c +++ b/src/sys/pagsh.c @@ -86,6 +86,13 @@ main(int argc, char *argv[]) static afs_uint32 curpag(void) { +#if defined(AFS_AIX51_ENV) + afs_int32 pag; + + if (kcred_getpag(cred, PAG_AFS, &pag) < 0 || pag == 0) + pag = NOPAG; + return pag; +#else afs_uint32 groups[NGROUPS_MAX]; afs_uint32 g0, g1; afs_uint32 h, l, ret; @@ -109,6 +116,7 @@ curpag(void) return -1; } return -1; +#endif } int -- 2.39.5