diff options
| author | Karel Zak <kzak@redhat.com> | 2016-01-07 11:02:49 +0100 |
|---|---|---|
| committer | Jeff Layton <jlayton@samba.org> | 2016-01-07 07:59:15 -0500 |
| commit | be5046ae3fabca17f19672f7b4019efb6a869298 (patch) | |
| tree | 85256378f69f5a31bb0bbd22844a800786c91f29 | |
| parent | dd13ac8a25d409a0d3d068b5b2b96f921f2613f2 (diff) | |
| download | cifs-utils-be5046ae3fabca17f19672f7b4019efb6a869298.tar.gz cifs-utils-be5046ae3fabca17f19672f7b4019efb6a869298.tar.bz2 cifs-utils-be5046ae3fabca17f19672f7b4019efb6a869298.zip | |
mount.cifs: ignore x-* mount options
x-* prefix is used for userspace mount options and it's pretty
commonly used to extend fstab configuration in systemd world (e.g.
x-systemd.automount). These options is necessary to ignored.
The command mount(8) does not pass x-* mount options to mount.<type>
helpers, but in some use-cases it's possible that the cifs helper reads
mount options from fstab or users directly call mount.cifs and copy & past
mount options, etc.
This patch marks all options prefixed by "x-" as OPT_IGNORE to make
things more robust for end-users. We already uses the same concept for
_netdev.
Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Jeff Layton <jlayton@samba.org>
| -rw-r--r-- | mount.cifs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mount.cifs.c b/mount.cifs.c index 3535096..5c5734f 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -756,6 +756,8 @@ static int parse_opt_token(const char *token) return OPT_BKUPGID; if (strncmp(token, "nofail", 6) == 0) return OPT_NOFAIL; + if (strncmp(token, "x-", 2) == 0) + return OPT_IGNORE; return OPT_ERROR; } |