STABLE14-revert-aix5-curpag-20061006

this doesn't work right now. revert it

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 0bc7902a570e6103fbc615a1e2bb756f342cdb53..7b6bac4fbe84863d31c69d3645aab058b194aaea 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -59,9 +59,6 @@ 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>
@@ -1615,13 +1612,6 @@ 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;
@@ -1645,7 +1635,6 @@ curpag()
            return -1;
     }
     return -1;
-#endif
 }
 
 

diff --git a/src/pam/afs_util.c b/src/pam/afs_util.c
index f423a72ff073d2c2e1381f730947d2be54d3faac..c8c5f343ea1466e2d1373321afc58e4575d82fe0 100644 (file)
--- a/src/pam/afs_util.c
+++ b/src/pam/afs_util.c
@@ -25,9 +25,6 @@
 #endif
 #endif
 #include <stdlib.h>
-#ifdef AFS_AIX51_ENV
-#include <sys/cred.h>
-#endif
 
 RCSID
     ("$Header$");
@@ -186,7 +183,7 @@ curpag(void)
 #if defined(AFS_AIX51_ENV)
     afs_int32 pag;
 
-    if (get_pag(PAG_AFS, &pag) < 0 || pag == 0)
+    if (kcred_getpag(cred, PAG_AFS, &pag) < 0 || pag == 0)
         pag = NOPAG;
     return pag;
 #else
@@ -213,7 +210,6 @@ 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 b6f8bd8de66b7d7e9f07719a7118b07c50946bc4..fcdbcc1864d01aec830a68e1d64f5ccb70db04bf 100644 (file)
--- a/src/sys/pagsh.c
+++ b/src/sys/pagsh.c
@@ -15,9 +15,6 @@ RCSID
 
 #ifdef AFS_AIX32_ENV
 #include <signal.h>
-#ifdef AFS_AIX51_ENV
-#include <sys/cred.h>
-#endif
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -89,13 +86,6 @@ 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;
@@ -119,7 +109,6 @@ curpag(void)
            return -1;
     }
     return -1;
-#endif
 }
 
 int