[Pkg-samba-maint] [samba] 56/135: docs: better document -e|--encrypt option globally.

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to branch master
in repository samba.

commit 000e7e6ea88574d7f0a088208042ad3655fcae6f
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 18 12:12:23 2013 +0100

    docs: better document -e|--encrypt option globally.
    
    This is taken from smbclient manpage.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit 5cab201a16663e9d91e4501124d6aeeaaa71e189)
---
 docs-xml/build/DTD/samba.entities | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index cb683d1..1e852ec 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -483,7 +483,14 @@ Try to use the credentials cached by winbind.
 <!ENTITY stdarg.encrypt '
 <varlistentry>
 <term>-e|--encrypt</term>
-<listitem><para>Encrypt SMB transport (UNIX extended servers only).
+<listitem><para>
+This command line parameter requires the remote
+server support the UNIX extensions or that the SMB3 protocol has been selected.
+Requests that the connection be encrypted. Negotiates SMB encryption using either
+SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for
+the encryption negotiation (either kerberos or NTLMv1/v2 if given
+domain/username/password triple. Fails the connection if encryption
+cannot be negotiated.
 </para></listitem>
 </varlistentry>
 '>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git