From: Jeremy Allison <jra@samba.org>
Date: Fri, 16 Aug 2013 23:45:26 +0000 (-0700)
Subject: Add "-e" encrypt transport command line option documentation for smbcacls.
X-Git-Tag: talloc-2.1.0~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b60d95abc767131b97151f03d7f668c81e728cb;p=thirdparty%2Fsamba.git

Add "-e" encrypt transport command line option documentation for smbcacls.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
---

diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index 39815a095f2..f8816ad9280 100644
--- a/docs-xml/manpages/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
@@ -33,6 +33,7 @@
 		<arg choice="opt">-U username</arg>
 		<arg choice="opt">-h</arg>
 		<arg choice="opt">-d</arg>
+		<arg choice="opt">-e</arg>
 		<arg choice="opt">-m|--max-protocol LEVEL</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
@@ -139,6 +140,18 @@
 		and masks to a readable string format.  </para></listitem>
 		</varlistentry>
 		
+		<varlistentry>
+		<term>-e</term>
+		<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>
+
 		<varlistentry>
 		<term>-m|--max-protocol PROTOCOL_NAME</term>
 		<listitem><para>This allows the user to select the