diff options
| author | Jeremy Allison <jra@samba.org> | 2013-08-16 16:53:45 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2013-08-30 11:53:27 +0200 |
| commit | 742c5c670b5c86f40f0a4f133f3dc2fc5580f620 (patch) | |
| tree | 265c23c641ad1d9c2da27f3a04932c885d6ee54d | |
| parent | 4b3ce19117b3c33986b1876b53272b502289fe13 (diff) | |
| download | samba-742c5c670b5c86f40f0a4f133f3dc2fc5580f620.tar.gz | |
Fix the documentation of --encrypt to explain SMB3 encryption for smbclient.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 4044e2beb7145afb261c98e100574e4e842e1b9e)
| -rw-r--r-- | docs-xml/manpages/smbclient.1.xml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml index 2ed53574d70..6717f18fd89 100644 --- a/docs-xml/manpages/smbclient.1.xml +++ b/docs-xml/manpages/smbclient.1.xml @@ -331,13 +331,14 @@ <varlistentry> <term>-e|--encrypt</term> - <listitem><para>This command line parameter requires the remote - server support the UNIX extensions. Request that the connection be - encrypted. This is new for Samba 3.2 and will only work with Samba - 3.2 or above servers. Negotiates SMB encryption using 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. + <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> |