afs_uint32 pagCounter = 0;
#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
+#ifdef AFS_LINUX26_ONEGROUP_ENV
+#define NUMPAGGROUPS 1
+#else
+#define NUMPAGGROUPS 2
+#endif
/* Local variables */
/*
*/
static int afs_pag_sleepcnt = 0;
+static int afs_pag_timewarn = 0;
static int
afs_pag_sleep(struct AFS_UCRED **acred)
if(osi_Time() - pag_epoch < pagCounter) {
rv = 1;
}
+ if (rv && (osi_Time() < pag_epoch)) {
+ if (!afs_pag_timewarn) {
+ afs_pag_timewarn = 1;
+ printf("clock went backwards, not PAG throttling");
+ }
+ rv = 0;
+ }
}
return rv;
return (code);
}
+#ifndef AFS_LINUX26_ONEGROUP_ENV
int
afs_getpag_val()
{
int pagvalue;
struct AFS_UCRED *credp = u.u_cred;
- int gidset0, gidset1;
+ gid_t gidset0, gidset1;
+#ifdef AFS_SUN510_ENV
+ const gid_t *gids;
+ gids = crgetgroups(*credp);
+ gidset0 = gids[0];
+ gidset1 = gids[1];
+#else
gidset0 = credp->cr_groups[0];
gidset1 = credp->cr_groups[1];
+#endif
pagvalue = afs_get_pag_from_groups(gidset0, gidset1);
return pagvalue;
}
+#endif
#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
afs_InitReq(register struct vrequest *av, struct AFS_UCRED *acred)
{
int code;
+ int i = 0;
AFS_STATCNT(afs_InitReq);
memset(av, 0, sizeof(*av));
if (afs_shuttingdown)
return EIO;
+ av->idleError = 0;
+ av->tokenError = 0;
+ while (i < MAXHOSTS) {
+ av->skipserver[i] = 0;
+ i++;
+ }
#ifdef AFS_LINUX26_ENV
+#if !defined(AFS_NONFSTRANS)
if (osi_linux_nfs_initreq(av, acred, &code))
return code;
#endif
+#endif
av->uid = PagInCred(acred);
if (av->uid == NOPAG) {
av->uid = -2; /* XXX nobody... ? */
else
av->uid = acred->cr_uid; /* bsd creds don't have ruid */
+#elif defined(AFS_SUN510_ENV)
+ av->uid = crgetruid(acred);
#else
av->uid = acred->cr_ruid; /* default when no pag is set */
#endif
}
+#ifdef AFS_LINUX26_ONEGROUP_ENV
+afs_uint32
+afs_get_pag_from_groups(struct group_info *group_info)
+{
+ afs_uint32 g0 = 0;
+ afs_uint32 i;
+ AFS_STATCNT(afs_get_pag_from_groups);
+ for (i = 0; (i < group_info->ngroups &&
+ (g0 = GROUP_AT(group_info, i)) != (gid_t) NOGROUP); i++) {
+ if (((g0 >> 24) & 0xff) == 'A')
+ return g0;
+ }
+ return NOPAG;
+}
+#else
afs_uint32
afs_get_pag_from_groups(gid_t g0a, gid_t g1a)
{
afs_uint32 h, l, ret;
AFS_STATCNT(afs_get_pag_from_groups);
+
g0 -= 0x3f00;
g1 -= 0x3f00;
if (g0 < 0xc000 && g1 < 0xc000) {
}
return NOPAG;
}
-
+#endif
void
afs_get_groups_from_pag(afs_uint32 pag, gid_t * g0p, gid_t * g1p)
{
+#ifndef AFS_LINUX26_ONEGROUP_ENV
unsigned short g0, g1;
+#endif
AFS_STATCNT(afs_get_groups_from_pag);
+#ifdef AFS_LINUX26_ONEGROUP_ENV
+ *g0p = pag;
+ *g1p = 0;
+#else
#if !defined(UKERNEL) || !defined(AFS_WEB_ENHANCEMENTS)
pag &= 0x7fffffff;
#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
g1 |= ((pag >> 28) % 3) << 14;
*g0p = g0 + 0x3f00;
*g1p = g1 + 0x3f00;
+#endif
}
afs_int32
-PagInCred(const struct AFS_UCRED *cred)
+PagInCred(struct AFS_UCRED *cred)
{
afs_int32 pag;
+#if !defined(AFS_LINUX26_ONEGROUP_ENV)
gid_t g0, g1;
+#endif
+#if defined(AFS_SUN510_ENV)
+ const gid_t *gids;
+ int ngroups;
+#endif
AFS_STATCNT(PagInCred);
if (cred == NULL || cred == afs_osi_credp) {
return NOPAG;
}
+#if defined(AFS_SUN510_ENV)
+ gids = crgetgroups(cred);
+ ngroups = crgetngroups(cred);
+#endif
#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
if (cred == NOCRED || cred == FSCRED) {
return NOPAG;
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;
}
#elif defined(AFS_LINUX26_ENV)
- if (cred->cr_group_info->ngroups < 2) {
+ if (cred->cr_group_info->ngroups < NUMPAGGROUPS) {
pag = NOPAG;
goto out;
}
#elif defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DUX40_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_XBSD_ENV)
+#if defined(AFS_SUN510_ENV)
+ if (ngroups < 2) {
+#else
if (cred->cr_ngroups < 2) {
+#endif
pag = NOPAG;
goto out;
}
#if defined(AFS_AIX51_ENV)
g0 = cred->cr_groupset.gs_union.un_groups[0];
g1 = cred->cr_groupset.gs_union.un_groups[1];
+#elif defined(AFS_LINUX26_ONEGROUP_ENV)
#elif defined(AFS_LINUX26_ENV)
g0 = GROUP_AT(cred->cr_group_info, 0);
g1 = GROUP_AT(cred->cr_group_info, 1);
+#elif defined(AFS_SUN510_ENV)
+ g0 = gids[0];
+ g1 = gids[1];
#else
g0 = cred->cr_groups[0];
g1 = cred->cr_groups[1];
#endif
#endif
+#if defined(AFS_LINUX26_ONEGROUP_ENV)
+ pag = (afs_int32) afs_get_pag_from_groups(cred->cr_group_info);
+#else
pag = (afs_int32) afs_get_pag_from_groups(g0, g1);
+#endif
out:
-#ifdef LINUX_KEYRING_SUPPORT
- if (pag == NOPAG) {
+#if defined(AFS_LINUX26_ENV) && defined(LINUX_KEYRING_SUPPORT)
+ if (pag == NOPAG && cred->cr_rgid != NFSXLATOR_CRED) {
struct key *key;
- afs_uint32 pag, newpag;
+ afs_uint32 upag, newpag;
key = request_key(&key_type_afs_pag, "_pag", NULL);
if (!IS_ERR(key)) {
if (key_validate(key) == 0 && key->uid == 0) { /* also verify in the session keyring? */
-
- pag = (afs_uint32) key->payload.value;
- if (((pag >> 24) & 0xff) == 'A')
- __setpag(&cred, pag, &newpag, 0);
+ upag = (afs_uint32) key->payload.value;
+ if (((upag >> 24) & 0xff) == 'A') {
+ __setpag(&cred, upag, &newpag, 0);
+ pag = (afs_int32) upag;
+ }
}
key_put(key);
}