diff options
author | Jeremy Allison <jra@samba.org> | 2013-08-16 16:53:45 -0700 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2013-08-21 17:28:56 +0200 |
commit | 4044e2beb7145afb261c98e100574e4e842e1b9e (patch) | |
tree | 4f3bda149358e677e11c443cbd17b4a05a7f2ab4 /docs-xml | |
parent | 90566fd0deb8768acc96b0a0bc573183c4db20ef (diff) | |
download | samba-4044e2beb7145afb261c98e100574e4e842e1b9e.tar.gz samba-4044e2beb7145afb261c98e100574e4e842e1b9e.tar.bz2 samba-4044e2beb7145afb261c98e100574e4e842e1b9e.zip |
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>
Diffstat (limited to 'docs-xml')
-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 3a3c4dfb4d..c3fe1d7e65 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> |