STABLE14-viced-write-perm-grants-read-lock-20070423

the permission to obtain a write-lock is granted either by having the
"w" permission or the "i" when owning the file.  The permission to obtain
a read-lock has been granted by having the "k" permission.  However it
makes no sense that someone can obtain a write-lock but not a read-lock.
This patch grants permission to obtain read-locks to those who can obtain
write-locks.

(cherry picked from commit bb61e1dc678ea28132c195438fc1f157fa580cd1)

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 2fef7eba5d462989440edc489bfbec5d80c7c19e..0d6c75ec5f2b9f9951514fbfdd57909fbdb241b6 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -1760,7 +1760,9 @@ HandleLocking(Vnode * targetptr, struct client *client, afs_int32 rights, ViceLo
                0;
        Time += AFS_LOCKWAIT;
        if (LockingType == LockRead) {
-           if ( !(rights & PRSFS_LOCK) )
+           if ( !(rights & PRSFS_LOCK) &&
+                 !(rights & PRSFS_WRITE) &&
+                 !(OWNSp(client, targetptr) && (rights & PRSFS_INSERT)) )
                return(EACCES);
  
            if (targetptr->disk.lock.lockCount >= 0) {