DEVEL15-aix5-curpag-20060719

curpag() exists in too many places
anyway, fix em

(cherry picked from commit 72abe41e1df0e530ae73e50b0b952b26d4e26683)

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 7b6bac4fbe84863d31c69d3645aab058b194aaea..d4564721dafa4dd780e6c3e2152f452bd50a0515 100644 (file)
--- 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 e98618e7c5fc7418fcc674d09aa75f05ad3eb28d..5c4d4cfcbfa571ccbdd75d703754054a99f424c2 100644 (file)
--- 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 fcdbcc1864d01aec830a68e1d64f5ccb70db04bf..ee04cc559ecdd468b64cb600aa17d4557d285195 100644 (file)
--- 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