svn commit: samba r5688 - in branches/SAMBA_3_0/source/client: .

[sfrench at samba.org]

Author: sfrench
Date: 2005-03-08 00:00:13 +0000 (Tue, 08 Mar 2005)
New Revision: 5688

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5688

Log:
ignore user_xattr mount parm so as not to confuse it with a user name

Modified:
   branches/SAMBA_3_0/source/client/mount.cifs.c


Changeset:
Modified: branches/SAMBA_3_0/source/client/mount.cifs.c
===================================================================
--- branches/SAMBA_3_0/source/client/mount.cifs.c	2005-03-07 23:54:24 UTC (rev 5687)
+++ branches/SAMBA_3_0/source/client/mount.cifs.c	2005-03-08 00:00:13 UTC (rev 5688)
@@ -79,7 +79,7 @@
 	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 @@
 			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') {