mount: append inverting options for mount.<type> on "users"

If you call mount(8) as root, then we need to append inverting options
(if specified by fstab) for "user" and "users" to /sbin/mount.<type>
command line, because for UID=0 mount.nfs follows command line rather
than the fstab setting.

This has been originally implemented by commit
a4c0cc75ff9744299f108c259efab1bd30c8007a for the old mount(8). The
same feature is supported by libmount, unfortunately for "user" only.
We need the same also for "users" to be backwardly compatible.

Addresses: https://github.com/karelzak/util-linux/issues/368
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 91611efcdf7c1fc22a69d2da4279c230cce6189f..a7ea832508e91515d48a0d2907ace8fcf3da39d1 100644 (file)
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -369,7 +369,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
        if (!*optstr)
                return -ENOMEM;
 
-       if (cxt->user_mountflags & MNT_MS_USER) {
+       if ((cxt->user_mountflags & MNT_MS_USER) ||
+           (cxt->user_mountflags & MNT_MS_USERS)) {
                /*
                 * This is unnecessary for real user-mounts as mount.<type>
                 * helpers always have to follow fstab rather than mount