The branch, v3-0-test has been updated
via 47f4662b6d727f2901d630d74792a6a971b54662 (commit)
from 8904b83ce6c69db31dc2ce4c05e8e8ee3db5ec3b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 47f4662b6d727f2901d630d74792a6a971b54662
Author: Karolin Seeger <ksee...@samba.org>
Date: Fri Jan 9 11:22:00 2009 +0100
docs: Improve man mount.cifs.
Add hint about specifying the workgroup in the credentials file.
Whitespace cleanup.
This fixes bug #4541.
Patch based on proposed patch from Christian Perrier <bubu...@debian.org>.
Thanks for reporting and providing a patch!
Karolin
(cherry picked from commit 1f7e09ea542df3a2f5f553c0cb11a39c74712950)
(cherry picked from commit b99d98ff2ef5491979301656e7f516d3c8829f6e)
(cherry picked from commit 1900233ede3083410eb3dc691d2d486c5340ccc4)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/mount.cifs.8.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml
b/docs-xml/manpages-3/mount.cifs.8.xml
index fcea5bc..86242a2 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -89,7 +89,7 @@ to be specified as part of the username.
<listitem><para>specifies the CIFS password. If this
option is not given then the environment variable
-<emphasis>PASSWD</emphasis> is used. If the password is not specified
+<emphasis>PASSWD</emphasis> is used. If the password is not specified
directly or indirectly via an argument to mount,
<emphasis>mount.cifs</emphasis> will prompt
for a password, unless the guest option is specified.
</para>
@@ -106,14 +106,16 @@ below) or entered at the password prompt will be read
correctly.
<listitem><para>
specifies a file that contains a username
- and/or password. The format of the file is:
+ and/or password and optionally the name of the
+ workgroup. The format of the file is:
</para>
<programlisting>
username=<replaceable>value</replaceable>
password=<replaceable>value</replaceable>
+ workgroup=<replaceable>value</replaceable>
</programlisting>
-
+
<para>
This is preferred over having passwords in plaintext in a
shared file, such as <filename>/etc/fstab</filename>. Be sure to protect any
--
Samba Shared Repository
