From ddfc6f28a73afc823bb7ab5466a840d9fd5c5ad2 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 23 Feb 2011 00:21:54 +0100 Subject: libmount: better "user" evaluation Signed-off-by: Karel Zak --- shlibs/mount/src/context_mount.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'shlibs/mount/src/context_mount.c') diff --git a/shlibs/mount/src/context_mount.c b/shlibs/mount/src/context_mount.c index 647e26149..5b9c0b195 100644 --- a/shlibs/mount/src/context_mount.c +++ b/shlibs/mount/src/context_mount.c @@ -185,11 +185,10 @@ static int evaluate_permissions(struct libmnt_context *cxt) return -EPERM; } - if (u_flags & (MNT_MS_OWNER | MNT_MS_GROUP)) - cxt->mountflags |= MS_OWNERSECURE; - - if (u_flags & (MNT_MS_USER | MNT_MS_USERS)) - cxt->mountflags |= MS_SECURE; + /* + * Note that MS_OWNERSECURE and MS_SECURE mount options + * are applied by mnt_optstr_get_flags() from mnt_context_merge_mflags() + */ srcpath = mnt_fs_get_srcpath(cxt->fs); if (!srcpath) -- cgit v1.2.3-55-g7522