bab4f11c74
- doc: update mailing list. - mount.cifs: don't send a mandatory ver= option to the kernel. - mount.cifs: remove smb2 multicall binary code. - doc: remove old XML sources for mount.cifs.8 and cifs.upcall.8. - mount.cifs: unused variables. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=58
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
commit bab572a89bd0d989bd761e8cea926dfcf48b938d
|
|
Author: Jeff Layton <jlayton@samba.org>
|
|
Date: Wed May 2 14:25:28 2012 -0400
|
|
|
|
mount.cifs: don't pass credentials= option to the kernel
|
|
|
|
We handle this option in userspace, so there's little value in also
|
|
passing it to the kernel.
|
|
|
|
Also fix minor double-comma nit in the options string.
|
|
|
|
Reported-by: Ronald <ronald645@gmail.com>
|
|
Signed-off-by: Jeff Layton <jlayton@samba.org>
|
|
|
|
Index: mount.cifs.c
|
|
===================================================================
|
|
--- mount.cifs.c.orig
|
|
+++ mount.cifs.c
|
|
@@ -1023,7 +1023,7 @@ parse_options(const char *data, struct p
|
|
rc, strerror(rc), value);
|
|
return rc;
|
|
}
|
|
- break;
|
|
+ goto nocopy;
|
|
|
|
case OPT_UID:
|
|
if (!value || !*value)
|
|
@@ -1834,7 +1834,9 @@ assemble_mountinfo(struct parsed_mount_i
|
|
}
|
|
|
|
/* copy in ver= string. It's not really needed, but what the hell */
|
|
- strlcat(parsed_info->options, ",ver=", sizeof(parsed_info->options));
|
|
+ if (*parsed_info->options)
|
|
+ strlcat(parsed_info->options, ",", sizeof(parsed_info->options));
|
|
+ strlcat(parsed_info->options, "ver=", sizeof(parsed_info->options));
|
|
strlcat(parsed_info->options, OPTIONS_VERSION, sizeof(parsed_info->options));
|
|
|
|
/* copy in user= string */
|