From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 6 Oct 2006 13:44:40 +0000 (+0000)
Subject: STABLE14-revert-aix5-curpag-20061006
X-Git-Tag: openafs-stable-1_4_2~30
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9846bea1f5fc19952593145f1d44f9248c1146e4;p=packages%2Fo%2Fopenafs.git

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 0bc7902a5..7b6bac4fb 100644
--- 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 f423a72ff..c8c5f343e 100644
--- 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 b6f8bd8de..fcdbcc186 100644
--- 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