patch-2.1.75 linux/fs/sysv/namei.c

• Lines: 24
• Date: Sun Dec 21 17:41:24 1997
• Orig file: v2.1.74/linux/fs/sysv/namei.c
• Orig date: Fri Dec 19 15:53:02 1997

diff -u --recursive --new-file v2.1.74/linux/fs/sysv/namei.c linux/fs/sysv/namei.c
@@ -420,9 +420,9 @@
 	retval = -EPERM;
 	inode = dentry->d_inode;
 
-        if ((dir->i_mode & S_ISVTX) && !fsuser() &&
+        if ((dir->i_mode & S_ISVTX) &&
             current->fsuid != inode->i_uid &&
-            current->fsuid != dir->i_uid)
+            current->fsuid != dir->i_uid && !fsuser())
 		goto end_rmdir;
 	if (inode->i_dev != dir->i_dev)
 		goto end_rmdir;
@@ -485,9 +485,9 @@
 		schedule();
 		goto repeat;
 	}
-	if ((dir->i_mode & S_ISVTX) && !fsuser() &&
+	if ((dir->i_mode & S_ISVTX) &&
 	    current->fsuid != inode->i_uid &&
-	    current->fsuid != dir->i_uid)
+	    current->fsuid != dir->i_uid && !fsuser())
 		goto end_unlink;
 	if (de->inode != inode->i_ino) {
 		retval = -ENOENT;