From: Andrew Bartlett Date: Thu, 9 Jan 2014 01:34:05 +0000 (+1300) Subject: docs: Change smb encrypt default in docs to match s3 and lib/param X-Git-Tag: samba-4.1.20~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972a97bc9f37253d0db32216dabef87c67ca5723;p=thirdparty%2Fsamba.git docs: Change smb encrypt default in docs to match s3 and lib/param BUG: https://bugzilla.samba.org/show_bug.cgi?id=11366 Signed-off-by: Andrew Bartlett Reviewed-by: Alexander Bokovoy (cherry picked from commit dba465b6c72c76781e8ca3909233d07028f99724) --- diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml index 51079aee2d6..b55af850434 100644 --- a/docs-xml/smbdotconf/security/smbencrypt.xml +++ b/docs-xml/smbdotconf/security/smbencrypt.xml @@ -35,10 +35,10 @@ as the GSSAPI flags use select both signing and sealing of the data. - When set to auto, SMB encryption is offered, but not enforced. + When set to auto or default, SMB encryption is offered, but not enforced. When set to mandatory, SMB encryption is required and if set to disabled, SMB encryption can not be negotiated. -auto +default