diff options
author | Damien Miller <djm@mindrot.org> | 2008-06-16 07:55:46 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-06-16 07:55:46 +1000 |
commit | c62a5af29ab1515f6093d84588f86a398e696a9a (patch) | |
tree | 89cd47286acfdc46de1cb105299351e11efdbec1 | |
parent | c7ce0da3b07a0318fa8407991f47c09a7748f4f6 (diff) |
- dtucker@cvs.openbsd.org 2008/06/15 16:55:38
[sshd_config.5]
MaxSessions is allowed in a Match block too
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd_config.5 | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -15,6 +15,9 @@ | |||
15 | [scp.1] | 15 | [scp.1] |
16 | Mention that scp follows symlinks during -r. bz #1466, | 16 | Mention that scp follows symlinks during -r. bz #1466, |
17 | from nectar at apple | 17 | from nectar at apple |
18 | - dtucker@cvs.openbsd.org 2008/06/15 16:55:38 | ||
19 | [sshd_config.5] | ||
20 | MaxSessions is allowed in a Match block too | ||
18 | 21 | ||
19 | 20080614 | 22 | 20080614 |
20 | - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction | 23 | - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction |
@@ -4387,4 +4390,4 @@ | |||
4387 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4390 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4388 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4391 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4389 | 4392 | ||
4390 | $Id: ChangeLog,v 1.5016 2008/06/15 21:55:06 djm Exp $ | 4393 | $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 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd_config.5,v 1.93 2008/06/10 07:12:00 jmc Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.94 2008/06/15 16:55:38 dtucker Exp $ |
38 | .Dd $Mdocdate: June 10 2008 $ | 38 | .Dd $Mdocdate: June 15 2008 $ |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -602,6 +602,7 @@ Available keywords are | |||
602 | .Cm HostbasedAuthentication , | 602 | .Cm HostbasedAuthentication , |
603 | .Cm KbdInteractiveAuthentication , | 603 | .Cm KbdInteractiveAuthentication , |
604 | .Cm KerberosAuthentication , | 604 | .Cm KerberosAuthentication , |
605 | .Cm MaxSessions , | ||
605 | .Cm PasswordAuthentication , | 606 | .Cm PasswordAuthentication , |
606 | .Cm PermitOpen , | 607 | .Cm PermitOpen , |
607 | .Cm PermitRootLogin , | 608 | .Cm PermitRootLogin , |