From: Richard Tollerton Date: Thu, 3 Jan 2013 06:05:34 +0000 (-0600) Subject: mount: Fix -t in listing mode when run as non-root X-Git-Tag: v2.23-rc1~369 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1707b9b104c4fb55eaa37581d6d7355a20cd9576;p=thirdparty%2Futil-linux.git mount: Fix -t in listing mode when run as non-root Presently, libmount-mount completely prohibits the use of -t by non-root users. This breaks using -t in listing mode as a user, which represents a regression against mount-deprecated, macosx and presumably *BSD. This commit fixes the issue by deferring the mnt_context_is_restricted check for -t until we know we're not in listing mode. Signed-off-by: Rich Tollerton --- diff --git a/sys-utils/mount.c b/sys-utils/mount.c index e29e34cfd3..fed96eb7be 100644 --- a/sys-utils/mount.c +++ b/sys-utils/mount.c @@ -800,7 +800,7 @@ int main(int argc, char **argv) /* only few options are allowed for non-root users */ if (mnt_context_is_restricted(cxt) && - !strchr("hlLUVvpris", c) && + !strchr("hlLUVvprist", c) && c != MOUNT_OPT_TARGET && c != MOUNT_OPT_SOURCE) exit_non_root(option_to_longopt(c, longopts)); @@ -950,6 +950,11 @@ int main(int argc, char **argv) goto done; } + /* Non-root users are allowed to use -t to print_all(), + but not to mount */ + if (mnt_context_is_restricted(cxt) && types) + exit_non_root("types"); + if (oper && (types || all || mnt_context_get_source(cxt))) usage(stderr);