Changeset 1047 for server/common/patches/openafs-scripts.patch

Timestamp:

Apr 2, 2009, 7:52:34 PM (15 years ago)

Author:

geofft

Message:

openafs-scripts.patch: efficiency hack

afs_GetAccessBits is a function call that can potentially do an RPC. Although I
doubt it does so in this context, we might as well short circuit it, because
the check for whether you're root or Apache is easy, and that case is rare.

File:

• server/common/patches/openafs-scripts.patch (modified) (2 diffs)

server/common/patches/openafs-scripts.patch

@@ -162 +162 @@
 +           !(((arights & ~(PRSFS_LOOKUP|PRSFS_READ)) == 0) && areq->realuid == HTTPD_UID) &&
 +           !(((arights & ~(PRSFS_LOOKUP|PRSFS_READ)) == 0) && areq->realuid == POSTFIX_UID) &&
-+           !(PRSFS_USR3 == afs_GetAccessBits(avc, PRSFS_USR3, areq) && areq->realuid == 0) &&
-+           !(PRSFS_USR4 == afs_GetAccessBits(avc, PRSFS_USR4, areq) && (areq->realuid == 0 || areq->realuid == SIGNUP_UID)) ) {
++           !(areq->realuid == 0 && PRSFS_USR3 == afs_GetAccessBits(avc, PRSFS_USR3, areq)) &&
++           !((areq->realuid == 0 || areq->realuid == SIGNUP_UID) && PRSFS_USR4 == afs_GetAccessBits(avc, PRSFS_USR4, areq)) ) {
 +         return 0;
 +      }
@@ -181 +181 @@
 +             !(arights == PRSFS_LOOKUP && areq->realuid == POSTFIX_UID) &&
 +             !(arights == PRSFS_READ && areq->realuid == HTTPD_UID && avc->m.Mode == 33279) &&
-+             !(PRSFS_USR3 == afs_GetAccessBits(avc, PRSFS_USR3, areq) && areq->realuid == 0) &&
-+             !(PRSFS_USR4 == afs_GetAccessBits(avc, PRSFS_USR4, areq) && (areq->realuid == 0 || areq->realuid == SIGNUP_UID)) ) {
++             !(areq->realuid == 0 && PRSFS_USR3 == afs_GetAccessBits(avc, PRSFS_USR3, areq)) &&
++             !((areq->realuid == 0 || areq->realuid == SIGNUP_UID) PRSFS_USR4 == afs_GetAccessBits(avc, PRSFS_USR4, areq)) ) {
 +           return 0;
 +        }