[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-1113-gd3b91e4
Steve French
smfrench at gmail.com
Sun Jan 6 03:24:52 GMT 2008
The branch, v3-2-test has been updated
via d3b91e494c824a65506ba1bc1cba5bba77000530 (commit)
via b9d2da4d10e6e7ac2dc604565c7f2ce39d0916b5 (commit)
from 3e3205309b75edf7d29633525adfdceb5f8856eb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit d3b91e494c824a65506ba1bc1cba5bba77000530
Merge: b9d2da4d10e6e7ac2dc604565c7f2ce39d0916b5 3e3205309b75edf7d29633525adfdceb5f8856eb
Author: Steve French <smfrench at gmail.com>
Date: Sat Jan 5 14:51:23 2008 -0600
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit b9d2da4d10e6e7ac2dc604565c7f2ce39d0916b5
Author: Steve French <stevef at smfhome2.smfdom>
Date: Thu Jan 3 17:13:38 2008 -0600
Update mount.cifs help
Steve
-----------------------------------------------------------------------
Summary of changes:
source/client/mount.cifs.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index a25ccc5..79f402a 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -39,7 +39,7 @@
#include <fcntl.h>
#define MOUNT_CIFS_VERSION_MAJOR "1"
-#define MOUNT_CIFS_VERSION_MINOR "10"
+#define MOUNT_CIFS_VERSION_MINOR "11"
#ifndef MOUNT_CIFS_VENDOR_SUFFIX
#ifdef _SAMBA_BUILD_
@@ -136,14 +136,16 @@ static void mount_cifs_usage(void)
printf("\nLess commonly used options:");
printf("\n\tcredentials=<filename>,guest,perm,noperm,setuids,nosetuids,rw,ro,");
printf("\n\tsep=<char>,iocharset=<codepage>,suid,nosuid,exec,noexec,serverino,");
- printf("\n\tdirectio,mapchars,nomapchars,nolock,servernetbiosname=<SRV_RFC1001NAME>");
+ printf("\n\tmapchars,nomapchars,nolock,servernetbiosname=<SRV_RFC1001NAME>");
+ printf("\n\tdirectio,nounix,cifsacl,sec=<authentication mechanism>,sign");
printf("\n\nOptions not needed for servers supporting CIFS Unix extensions");
printf("\n\t(e.g. unneeded for mounts to most Samba versions):");
printf("\n\tuid=<uid>,gid=<gid>,dir_mode=<mode>,file_mode=<mode>,sfu");
printf("\n\nRarely used options:");
printf("\n\tport=<tcpport>,rsize=<size>,wsize=<size>,unc=<unc_name>,ip=<ip_address>,");
printf("\n\tdev,nodev,nouser_xattr,netbiosname=<OUR_RFC1001NAME>,hard,soft,intr,");
- printf("\n\tnointr,ignorecase,noposixpaths,noacl");
+ printf("\n\tnointr,ignorecase,noposixpaths,noacl,prefixpath=<path>,nobrl");
+ printf("\n\tin6_addr");
printf("\n\nOptions are described in more detail in the manual page");
printf("\n\tman 8 mount.cifs\n");
printf("\nTo display the version number of the mount helper:");
--
Samba Shared Repository
More information about the samba-cvs
mailing list