DEVEL15-aix5-revert-kcred-20071108

pull this back to 1.5 and head

(cherry picked from commit 277c37f48c8126ba9cb986ffc7361fcb98e2bbf2)

diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
index ac6062b15e53ca2e675c93cee1db60b2c09c180d..b65e370d64b8614264b1ac9306e4d0723e408236 100644 (file)
--- a/src/afs/afs_osi_pag.c
+++ b/src/afs/afs_osi_pag.c
@@ -554,11 +554,7 @@ PagInCred(const struct AFS_UCRED *cred)
     g0 = cred->cr_groups[1];
     g1 = cred->cr_groups[2];
 #else
-#if defined(AFS_AIX51_ENV)
-    if (kcred_getpag(cred, PAG_AFS, &pag) < 0 || pag == 0)
-       pag = NOPAG;
-    return pag;
-#elif defined(AFS_AIX_ENV)
+#if defined(AFS_AIX_ENV)
     if (cred->cr_ngrps < 2) {
        return NOPAG;
     }

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 16457028fd5e0680f799d852180d75391758bc47..4c32142e46b3f3c07159fa2f025d620f02f6fdee 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -1610,13 +1610,6 @@ afs_tf_dest_tkt(void)
 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
     gid_t groups[NGROUPS_MAX];
     afs_uint32 g0, g1;
     afs_uint32 h, l, ret;
@@ -1640,7 +1633,6 @@ curpag(void)
            return -1;
     }
     return -1;
-#endif
 }
 
 int