From c62a5af29ab1515f6093d84588f86a398e696a9a Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 16 Jun 2008 07:55:46 +1000 Subject: [PATCH] - dtucker@cvs.openbsd.org 2008/06/15 16:55:38 [sshd_config.5] MaxSessions is allowed in a Match block too --- ChangeLog | 5 ++++- sshd_config.5 | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3af392c02..5f5fcdec7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ [scp.1] Mention that scp follows symlinks during -r. bz #1466, from nectar at apple + - dtucker@cvs.openbsd.org 2008/06/15 16:55:38 + [sshd_config.5] + MaxSessions is allowed in a Match block too 20080614 - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction @@ -4387,4 +4390,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5016 2008/06/15 21:55:06 djm Exp $ +$Id: ChangeLog,v 1.5017 2008/06/15 21:55:46 djm Exp $ diff --git a/sshd_config.5 b/sshd_config.5 index ea6523584..5ec007f15 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -34,8 +34,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.93 2008/06/10 07:12:00 jmc Exp $ -.Dd $Mdocdate: June 10 2008 $ +.\" $OpenBSD: sshd_config.5,v 1.94 2008/06/15 16:55:38 dtucker Exp $ +.Dd $Mdocdate: June 15 2008 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -602,6 +602,7 @@ Available keywords are .Cm HostbasedAuthentication , .Cm KbdInteractiveAuthentication , .Cm KerberosAuthentication , +.Cm MaxSessions , .Cm PasswordAuthentication , .Cm PermitOpen , .Cm PermitRootLogin ,