STABLE14-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..0bc7902a570e6103fbc615a1e2bb756f342cdb53 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -59,6 +59,9 @@ RCSID
 #include <afs/vice.h>
 #ifdef AFS_AIX_ENV
 #include <sys/lockf.h>
+#ifdef AFS_AIX51_ENV
+#include <sys/cred.h>
+#endif
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -1612,6 +1615,13 @@ afs_tf_dest_tkt()
 static afs_uint32
 curpag()
 {
+#if defined(AFS_AIX51_ENV)
+    afs_int32 pag;
+
+    if (get_pag(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 +1645,7 @@ curpag()
            return -1;
     }
     return -1;
+#endif
 }
 
 

diff --git a/src/pam/afs_util.c b/src/pam/afs_util.c
index e98618e7c5fc7418fcc674d09aa75f05ad3eb28d..f423a72ff073d2c2e1381f730947d2be54d3faac 100644 (file)
--- a/src/pam/afs_util.c
+++ b/src/pam/afs_util.c
@@ -25,6 +25,9 @@
 #endif
 #endif
 #include <stdlib.h>
+#ifdef AFS_AIX51_ENV
+#include <sys/cred.h>
+#endif
 
 RCSID
     ("$Header$");
@@ -180,6 +183,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 (get_pag(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 +213,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..b6f8bd8de66b7d7e9f07719a7118b07c50946bc4 100644 (file)
--- a/src/sys/pagsh.c
+++ b/src/sys/pagsh.c
@@ -15,6 +15,9 @@ RCSID
 
 #ifdef AFS_AIX32_ENV
 #include <signal.h>
+#ifdef AFS_AIX51_ENV
+#include <sys/cred.h>
+#endif
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -86,6 +89,13 @@ main(int argc, char *argv[])
 static afs_uint32
 curpag(void)
 {
+#if defined(AFS_AIX51_ENV)
+    afs_int32 pag;
+
+    if (get_pag(PAG_AFS, &pag) < 0 || pag == 0)
+        pag = -1;
+    return pag;
+#else
     afs_uint32 groups[NGROUPS_MAX];
     afs_uint32 g0, g1;
     afs_uint32 h, l, ret;
@@ -109,6 +119,7 @@ curpag(void)
            return -1;
     }
     return -1;
+#endif
 }
 
 int