patch-2.4.0-test11 linux/fs/ncpfs/ioctl.c

• Lines: 32
• Date: Tue Nov 14 10:54:07 2000
• Orig file: v2.4.0-test10/linux/fs/ncpfs/ioctl.c
• Orig date: Tue Aug 29 14:09:15 2000

diff -u --recursive --new-file v2.4.0-test10/linux/fs/ncpfs/ioctl.c linux/fs/ncpfs/ioctl.c
@@ -86,10 +86,8 @@
 
 	case NCP_IOC_CONN_LOGGED_IN:
 
-		if ((permission(inode, MAY_WRITE) != 0)
-		    && (current->uid != server->m.mounted_uid)) {
+		if (!capable(CAP_SYS_ADMIN))
 			return -EACCES;
-		}
 		if (!(server->m.int_flags & NCP_IMOUNT_LOGGEDIN_POSSIBLE))
 			return -EINVAL;
 		if (server->root_setuped)
@@ -207,8 +205,7 @@
 			struct nw_info_struct i;
 			struct dentry* dentry;
 
-			if (   (permission(inode, MAY_WRITE) != 0)
-			    && (current->uid != server->m.mounted_uid))
+			if (!capable(CAP_SYS_ADMIN))
 			{
 				return -EACCES;
 			}
@@ -513,8 +510,7 @@
  * Thanks Petr Vandrovec for idea and many hints.
  */
 	case NCP_IOC_SETCHARSETS:
-		if ((permission(inode, MAY_WRITE) != 0) &&
-				 (current->uid != server->m.mounted_uid))
+		if (!capable(CAP_SYS_ADMIN))
 			return -EACCES;
 		if (server->root_setuped)
 			return -EBUSY;