patch-2.2.0-pre5 linux/fs/ufs/acl.c

• Lines: 15
• Date: Mon Jan 4 11:51:29 1999
• Orig file: v2.2.0-pre4/linux/fs/ufs/acl.c
• Orig date: Sat Sep 5 16:46:41 1998

diff -u --recursive --new-file v2.2.0-pre4/linux/fs/ufs/acl.c linux/fs/ufs/acl.c
@@ -58,8 +58,11 @@
 	 * Access is always granted for root. We now check last,
 	 * though, for BSD process accounting correctness
 	 */
-	if (((mode & mask & S_IRWXO) == mask) || fsuser())
+	if (((mode & mask & S_IRWXO) == mask) || capable(CAP_DAC_OVERRIDE))
 		return 0;
-	else
-		return -EACCES;
+	if ((mask == S_IROTH) ||
+	    (S_ISDIR(mode)  && !(mask & ~(S_IROTH | S_IXOTH))))
+		if (capable(CAP_DAC_READ_SEARCH))
+			return 0;
+	return -EACCES;
 }