git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
This commit was manufactured by cvs2svn to create branch 'vserver'.
[linux-2.6.git]
/
fs
/
namespace.c
diff --git
a/fs/namespace.c
b/fs/namespace.c
index
dfeac21
..
fa8b30e
100644
(file)
--- a/
fs/namespace.c
+++ b/
fs/namespace.c
@@
-691,7
+691,7
@@
static int do_add_mount(struct nameidata *nd, char *type, int flags,
return -EINVAL;
/* we need capabilities... */
- if (!capable(CAP_SYS_ADMIN))
+ if (!capable(CAP_SYS_ADMIN)
&& !vx_ccaps(VXC_SECURE_MOUNT)
)
return -EPERM;
mnt = do_kern_mount(type, flags, name, data);