summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorSteve French <sfrench@samba.org>2005-03-08 00:00:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:55 -0500
commit9db6a5cc3df38c323471852d99d639c785e5c20d (patch)
treefdf84868a511c57706ce48d9ea29ec0c18295135 /source3/client
parent00340b20f956a1b6a55654bba1e1c396b9db479a (diff)
downloadsamba-9db6a5cc3df38c323471852d99d639c785e5c20d.tar.gz
samba-9db6a5cc3df38c323471852d99d639c785e5c20d.tar.bz2
samba-9db6a5cc3df38c323471852d99d639c785e5c20d.zip
r5688: ignore user_xattr mount parm so as not to confuse it with a user name
(This used to be commit 58afef91c52293d72f1066a27387a60e51be4e79)
Diffstat (limited to 'source3/client')
-rwxr-xr-xsource3/client/mount.cifs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index 5aa6056fe8..7b30b98fa7 100755
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -79,7 +79,7 @@ static void mount_cifs_usage(void)
printf(" to a local directory.\n\nOptions:\n");
printf("\tuser=<arg>\n\tpass=<arg>\n\tdom=<arg>\n");
printf("\nLess commonly used options:");
- printf("\n\tcredentials=<filename>,guest,perm,noperm,setuids,nosetuids,\n\trw,ro,sep=<char>,iocharset=<codepage>,suid,nosuid,exec,noexec");
+ printf("\n\tcredentials=<filename>,guest,perm,noperm,setuids,nosetuids,\n\trw,ro,sep=<char>,iocharset=<codepage>,suid,nosuid,exec,noexec,directio");
printf("\n\nOptions not needed for servers supporting CIFS Unix extensions (e.g. most Samba versions):");
printf("\n\tuid=<uid>,gid=<gid>,dir_mode=<mode>,file_mode=<mode>");
printf("\n\nRarely used options:");
@@ -295,6 +295,8 @@ static int parse_options(char * options, int * filesys_flags)
if(!value || !*value) {
strncpy(data,",,,,,",5);
}
+ } else if (strncmp(data, "user_xattr",10) == 0) {
+ /* do nothing - need to skip so not parsed as user name */
} else if (strncmp(data, "user", 4) == 0) {
if (!value || !*value) {
if(data[4] == '\0') {