* PagInCred
*/
-#include "../afs/param.h" /* Should be always first */
+#include <afsconfig.h>
+#include "../afs/param.h"
+
+RCSID("$Header$");
+
#include "../afs/sysincludes.h" /* Standard vendor system headers */
#include "../afs/afsincludes.h" /* Afs-based standard headers */
#include "../afs/afs_stats.h" /* statistics */
* secure (although of course not absolutely secure).
*/
#if !defined(UKERNEL) || !defined(AFS_WEB_ENHANCEMENTS)
-afs_uint32 genpag(void) {
+afs_uint32 genpag(void)
+{
AFS_STATCNT(genpag);
#ifdef AFS_LINUX20_ENV
/* Ensure unique PAG's (mod 200 days) when reloading the client. */
#endif /* AFS_LINUX20_ENV */
}
-afs_uint32 getpag(void) {
+afs_uint32 getpag(void)
+{
AFS_STATCNT(getpag);
#ifdef AFS_LINUX20_ENV
/* Ensure unique PAG's (mod 200 days) when reloading the client. */
/* Web enhancement: we don't need to restrict pags to 41XXXXXX since
* we are not sharing the space with anyone. So we use the full 32 bits. */
-afs_uint32 genpag(void) {
+afs_uint32 genpag(void)
+{
AFS_STATCNT(genpag);
#ifdef AFS_LINUX20_ENV
return (pag_epoch + pagCounter++);
#endif /* AFS_LINUX20_ENV */
}
-afs_uint32 getpag(void) {
+afs_uint32 getpag(void)
+{
AFS_STATCNT(getpag);
#ifdef AFS_LINUX20_ENV
/* Ensure unique PAG's (mod 200 days) when reloading the client. */
int
#if defined(AFS_SUN5_ENV)
afs_setpag (struct AFS_UCRED **credpp)
-#elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
afs_setpag (struct proc *p, void *args, int *retval)
#else
afs_setpag (void)
#endif /* defined(AFS_SGI53_ENV) && defined(MP) */
AFS_STATCNT(afs_setpag);
-#ifdef AFS_SUN5_ENV
+#if defined(AFS_SUN5_ENV)
if (!afs_suser(*credpp))
+#elif defined(AFS_OBSD_ENV)
+ if (!afs_osi_suser(p->p_cred->pc_ucred))
#else
if (!afs_suser())
#endif
#if defined(AFS_SUN5_ENV)
code = AddPag(genpag(), credpp);
-#elif defined(AFS_OSF_ENV) || defined(AFS_FBSD_ENV)
+#elif defined(AFS_OSF_ENV) || defined(AFS_XBSD_ENV)
code = AddPag(p, genpag(), &p->p_rcred);
#elif defined(AFS_AIX41_ENV)
{
code = AddPag(genpag(), &credp);
crfree(credp);
}
-#elif defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
{
struct ucred *credp=crdup(p->p_cred->pc_ucred);
code=AddPag(p, genpag(), &credp);
#endif
afs_Trace1(afs_iclSetp, CM_TRACE_SETPAG, ICL_TYPE_INT32, code);
-#if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(KERNEL_HAVE_UERROR)
+ if (!getuerror())
+ setuerror(code);
+#endif
#if defined(AFS_SGI53_ENV) && defined(MP)
AFS_GUNLOCK();
-#endif /* defined(AFS_SGI53_ENV) && defined(MP) */
- return (code);
-#else
- if (!getuerror())
- setuerror(code);
+#endif /* defined(AFS_SGI53_ENV) && defined(MP) */
return (code);
-#endif
}
#if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
int
#if defined(AFS_SUN5_ENV)
afs_setpag_val (struct AFS_UCRED **credpp, int pagval)
-#elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
afs_setpag_val (struct proc *p, void *args, int *retval, int pagval)
#else
afs_setpag_val (int pagval)
#if defined(AFS_SUN5_ENV)
code = AddPag(pagval, credpp);
-#elif defined(AFS_OSF_ENV) || defined(AFS_FBSD_ENV)
+#elif defined(AFS_OSF_ENV) || defined(AFS_XBSD_ENV)
code = AddPag(p, pagval, &p->p_rcred);
#elif defined(AFS_AIX41_ENV)
{
code = AddPag(pagval, &credp);
crfree(credp);
}
-#elif defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
{
struct ucred *credp=crdup(p->p_cred->pc_ucred);
code=AddPag(p, pagval, &credp);
#endif
afs_Trace1(afs_iclSetp, CM_TRACE_SETPAG, ICL_TYPE_INT32, code);
-#if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(KERNEL_HAVE_UERROR)
+ if (!getuerror())
+ setuerror(code);
+#endif
#if defined(AFS_SGI53_ENV) && defined(MP)
AFS_GUNLOCK();
#endif /* defined(AFS_SGI53_ENV) && defined(MP) */
return (code);
-#else
- if (!getuerror())
- setuerror(code);
- return (code);
-#endif
}
#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
-#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+/* Note - needs to be available on AIX, others can be static - rework this */
+#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
int AddPag(struct proc *p, afs_int32 aval, struct AFS_UCRED **credpp)
-#else /* AFS_OSF_ENV || AFS_FBSD_ENV */
+#else /* AFS_OSF_ENV || AFS_XBSD_ENV */
int AddPag(afs_int32 aval, struct AFS_UCRED **credpp)
#endif
{
afs_int32 newpag, code;
AFS_STATCNT(AddPag);
-#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
- if (code = setpag(p, credpp, aval, &newpag, 0))
+#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
+ if ((code = setpag(p, credpp, aval, &newpag, 0)))
#else /* AFS_OSF_ENV */
- if (code = setpag(credpp, aval, &newpag, 0))
+ if ((code = setpag(credpp, aval, &newpag, 0)))
#endif
-#if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
return (code);
#else
return (setuerror(code), code);
}
-afs_InitReq(av, acred)
- register struct vrequest *av;
- struct AFS_UCRED *acred; {
-
+int afs_InitReq(register struct vrequest *av, struct AFS_UCRED *acred)
+{
AFS_STATCNT(afs_InitReq);
if (afs_shuttingdown) return EIO;
av->uid = PagInCred(acred);
* think it's ok to use the real uid to make setuid
* programs (without setpag) to work properly.
*/
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
av->uid = acred->cr_uid; /* default when no pag is set */
/* bsd creds don't have ruid */
#else
if (cred == NULL) {
return NOPAG;
}
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
if (cred == NOCRED || cred == FSCRED) {
return NOPAG;
}
g1 = cred->cr_groups[2];
#else
#ifdef AFS_AIX_ENV
+#ifdef AFS_AIX51_ENV
+ if (kcred_getpag(cred, PAG_AFS, &pag) < 0 || pag == 0)
+ pag = NOPAG;
+ return pag;
+#else
if (cred->cr_ngrps < 2) {
return NOPAG;
}
+#endif
#else
-#if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DUX40_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DUX40_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_XBSD_ENV)
if (cred->cr_ngroups < 2) return NOPAG;
#endif
#endif
+#ifdef AFS_AIX51_ENV
+ g0 = cred->cr_groupset.gs_union.un_groups[0];
+ g1 = cred->cr_groupset.gs_union.un_groups[1];
+#else
g0 = cred->cr_groups[0];
g1 = cred->cr_groups[1];
#endif
+#endif
pag = (afs_int32)afs_get_pag_from_groups(g0, g1);
return pag;
}