[SCM] Samba Shared Repository - branch v3-5-stable updated

[Karolin Seeger]

The branch, v3-5-stable has been updated
       via  01c21d7... s3-docs: Document 'smbclient -C'. (cherry picked from commit f6c39cec27eea2522c62e6f1ff85efdafde351ac) (cherry picked from commit f6a7e9eadf85b19ec0ccca513a261bcad0bcf048)
      from  5541251... s3/smbd: change locking behavior when "lock spin time = 0".

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable


- Log -----------------------------------------------------------------
commit 01c21d78cf93277658e05450a8937bcefc53b3b4
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 16 11:00:08 2010 +0100

    s3-docs: Document 'smbclient -C'.
    (cherry picked from commit f6c39cec27eea2522c62e6f1ff85efdafde351ac)
    (cherry picked from commit f6a7e9eadf85b19ec0ccca513a261bcad0bcf048)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/build/DTD/samba.entities   |   10 ++++++++++
 docs-xml/manpages-3/smbclient.1.xml |    2 ++
 2 files changed, 12 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index 4ad65ca..d204156 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -428,6 +428,15 @@ an Active Directory environment.
 </varlistentry>
 '>
 
+<!ENTITY stdarg.useccache '
+<varlistentry>
+<term>-C|--use-ccache</term>
+<listitem><para>
+Try to use the credentials cached by winbind.
+</para></listitem>
+</varlistentry>
+'>
+
 
 <!ENTITY stdarg.help '
 <varlistentry>
@@ -439,6 +448,7 @@ an Active Directory environment.
 <!ENTITY popt.common.credentials '
 &stdarg.nopass;
 &stdarg.kerberos;
+&stdarg.useccache;
 &stdarg.authfile;
 &stdarg.username;
 '>
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index 6b5a8c5..cadd2ea 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -30,6 +30,7 @@
 		<arg choice="opt">-m maxprotocol</arg>
 		<arg choice="opt">-A authfile</arg>
 		<arg choice="opt">-N</arg>
+		<arg choice="opt">-C</arg>
 		<arg choice="opt">-g</arg>
 		<arg choice="opt">-i scope</arg>
 		<arg choice="opt">-O &lt;socket options&gt;</arg>
@@ -55,6 +56,7 @@
 		<arg choice="opt">-m maxprotocol</arg>
 		<arg choice="opt">-A authfile</arg>
 		<arg choice="opt">-N</arg>
+		<arg choice="opt">-C</arg>
 		<arg choice="opt">-g</arg>
 		<arg choice="opt">-l log-basename</arg>
 		<arg choice="opt">-I destinationIP</arg>


-- 
Samba Shared Repository