From 9db6a5cc3df38c323471852d99d639c785e5c20d Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 8 Mar 2005 00:00:13 +0000 Subject: r5688: ignore user_xattr mount parm so as not to confuse it with a user name (This used to be commit 58afef91c52293d72f1066a27387a60e51be4e79) --- source3/client/mount.cifs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3') 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=\n\tpass=\n\tdom=\n"); printf("\nLess commonly used options:"); - printf("\n\tcredentials=,guest,perm,noperm,setuids,nosetuids,\n\trw,ro,sep=,iocharset=,suid,nosuid,exec,noexec"); + printf("\n\tcredentials=,guest,perm,noperm,setuids,nosetuids,\n\trw,ro,sep=,iocharset=,suid,nosuid,exec,noexec,directio"); printf("\n\nOptions not needed for servers supporting CIFS Unix extensions (e.g. most Samba versions):"); printf("\n\tuid=,gid=,dir_mode=,file_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') { -- cgit