1 files changed, 11 insertions, 3 deletions
diff --git a/sshd_config.5 b/sshd_config.5
index d94c5f5c0..c8444610b 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.215 2015/11/13 04:38:06 djm Exp $
+.\" $OpenBSD: sshd_config.5,v 1.216 2016/02/05 02:37:56 djm Exp $
-.Dd $Mdocdate: November 13 2015 $
+.Dd $Mdocdate: February 5 2016 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1143,7 +1143,15 @@ Once the number of failures reaches half this value,
 additional failures are logged.
 The default is 6.
 .It Cm MaxSessions
-Specifies the maximum number of open sessions permitted per network connection.
+Specifies the maximum number of open shell, login or subsystem (e.g. sftp)
+sessions permitted per network connection.
+Multiple sessions may be established by clients that support connection
+multiplexing.
+Setting
+.Cm MaxSessions
+to 1 will effectively disable session multiplexing, whereas setting it to 0
+will prevent all shell, login and subsystem sessions while still permitting
+forwarding.
 The default is 10.
 .It Cm MaxStartups
 Specifies the maximum number of concurrent unauthenticated connections to the

diff --git a/sshd_config.5 b/sshd_config.5 index d94c5f5c0..c8444610b 100644 --- a/sshd_config.5 +++ b/sshd_config.5
@@ -33,8 +33,8 @@
33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35	.\"	35	.\"
36	.\" $OpenBSD: sshd_config.5,v 1.215 2015/11/13 04:38:06 djm Exp $	36	.\" $OpenBSD: sshd_config.5,v 1.216 2016/02/05 02:37:56 djm Exp $
37	.Dd $Mdocdate: November 13 2015 $	37	.Dd $Mdocdate: February 5 2016 $
38	.Dt SSHD_CONFIG 5	38	.Dt SSHD_CONFIG 5
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -1143,7 +1143,15 @@ Once the number of failures reaches half this value,
1143	additional failures are logged.	1143	additional failures are logged.
1144	The default is 6.	1144	The default is 6.
1145	.It Cm MaxSessions	1145	.It Cm MaxSessions
1146	Specifies the maximum number of open sessions permitted per network connection.	1146	Specifies the maximum number of open shell, login or subsystem (e.g. sftp)
		1147	sessions permitted per network connection.
		1148	Multiple sessions may be established by clients that support connection
		1149	multiplexing.
		1150	Setting
		1151	.Cm MaxSessions
		1152	to 1 will effectively disable session multiplexing, whereas setting it to 0
		1153	will prevent all shell, login and subsystem sessions while still permitting
		1154	forwarding.
1147	The default is 10.	1155	The default is 10.
1148	.It Cm MaxStartups	1156	.It Cm MaxStartups
1149	Specifies the maximum number of concurrent unauthenticated connections to the	1157	Specifies the maximum number of concurrent unauthenticated connections to the