summaryrefslogtreecommitdiff
path: root/usr/src/man/man4
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-06-11 11:11:22 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-06-11 11:11:22 +0000
commitcbb330f03aa8f580120280a310063f06befd0333 (patch)
tree5bea6dc6c737f2461ee710fb82bf9085d7932412 /usr/src/man/man4
parente68253c14d11e4fca612757ffc9b8826eca30f37 (diff)
parent807b45f18e924af3195f2516242af310f774528c (diff)
downloadillumos-joyent-cbb330f03aa8f580120280a310063f06befd0333.tar.gz
[illumos-gate merge]
commit 807b45f18e924af3195f2516242af310f774528c 11093 libsocket: NULL pointer errors commit 5419c0309c3a28f6bfee2e35aefebca2200d046d 11019 Enable SMB3 server by default commit 1160dcf7283d2485f2b9c32da573db0275558d9b 11018 SMB3 Encryption commit 0ab6f5190f1236c6d1d0e14df5129e0694b77426 11204 smatch issue in zlib/deflate.c
Diffstat (limited to 'usr/src/man/man4')
-rw-r--r--usr/src/man/man4/smb.448
1 files changed, 42 insertions, 6 deletions
diff --git a/usr/src/man/man4/smb.4 b/usr/src/man/man4/smb.4
index 5fbc3fca3c..d22d6f969c 100644
--- a/usr/src/man/man4/smb.4
+++ b/usr/src/man/man4/smb.4
@@ -1,10 +1,22 @@
'\" te
.\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved.
-.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
-.\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
-.\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SMB 4 "Sep 25, 2009"
+.\" Copyright 2016, Nexenta Systems, Inc. All Rights Reserved.
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
+.\"
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+.\" or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
+.TH SMB 4 "Apr 23, 2015"
.SH NAME
smb \- configuration properties for Solaris CIFS server
.SH DESCRIPTION
@@ -100,7 +112,31 @@ value is \fBfalse\fR.
.sp
.ne 2
.na
-\fB\fBipv6_enabled\fR\fR
+\fB\fBencrypt\fR\fR
+.ad
+.sp .6
+.RS 4n
+Controls SMB3 Encryption. For requests on a particular share, the server's
+behavior is controlled by the stricter of this option and the per-share
+"encrypt" option.
+.sp
+When set to \fBdisabled\fR, the server will not ask clients to encrypt requests.
+When set to \fBenabled\fR, the server will ask clients to encrypt requests,
+but will not require that they do so. Any message that can be encrypted
+will be encrypted.
+When set to \fBrequired\fR, the server will deny access to or disconnect
+any client that does not support encryption or fails to encrypt requests
+that they should.
+.sp
+In other words, the \fBenabled\fR behavior is that any message that CAN
+be encrypted SHOULD be encrypted, while the \fBrequired\fR behavior is that any
+message that CAN be encrypted MUST be encrypted.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBipv6_enable\fR\fR
.ad
.sp .6
.RS 4n