diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | servconf.c | 5 | ||||
-rw-r--r-- | sshd_config.5 | 3 |
3 files changed, 9 insertions, 4 deletions
@@ -18,6 +18,9 @@ | |||
18 | - dtucker@cvs.openbsd.org 2008/06/15 16:55:38 | 18 | - dtucker@cvs.openbsd.org 2008/06/15 16:55:38 |
19 | [sshd_config.5] | 19 | [sshd_config.5] |
20 | MaxSessions is allowed in a Match block too | 20 | MaxSessions is allowed in a Match block too |
21 | - dtucker@cvs.openbsd.org 2008/06/15 16:58:40 | ||
22 | [servconf.c sshd_config.5] | ||
23 | Allow MaxAuthTries within a Match block. ok djm@ | ||
21 | 24 | ||
22 | 20080614 | 25 | 20080614 |
23 | - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction | 26 | - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction |
@@ -4390,4 +4393,4 @@ | |||
4390 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4393 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4391 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4394 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4392 | 4395 | ||
4393 | $Id: ChangeLog,v 1.5017 2008/06/15 21:55:46 djm Exp $ | 4396 | $Id: ChangeLog,v 1.5018 2008/06/15 21:56:20 djm Exp $ |
diff --git a/servconf.c b/servconf.c index 8f5ddbd33..67e7d7db3 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.183 2008/06/10 23:06:19 djm Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.184 2008/06/15 16:58:40 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -398,7 +398,7 @@ static struct { | |||
398 | { "gatewayports", sGatewayPorts, SSHCFG_ALL }, | 398 | { "gatewayports", sGatewayPorts, SSHCFG_ALL }, |
399 | { "subsystem", sSubsystem, SSHCFG_GLOBAL }, | 399 | { "subsystem", sSubsystem, SSHCFG_GLOBAL }, |
400 | { "maxstartups", sMaxStartups, SSHCFG_GLOBAL }, | 400 | { "maxstartups", sMaxStartups, SSHCFG_GLOBAL }, |
401 | { "maxauthtries", sMaxAuthTries, SSHCFG_GLOBAL }, | 401 | { "maxauthtries", sMaxAuthTries, SSHCFG_ALL }, |
402 | { "maxsessions", sMaxSessions, SSHCFG_ALL }, | 402 | { "maxsessions", sMaxSessions, SSHCFG_ALL }, |
403 | { "banner", sBanner, SSHCFG_ALL }, | 403 | { "banner", sBanner, SSHCFG_ALL }, |
404 | { "usedns", sUseDNS, SSHCFG_GLOBAL }, | 404 | { "usedns", sUseDNS, SSHCFG_GLOBAL }, |
@@ -1403,6 +1403,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) | |||
1403 | M_CP_INTOPT(x11_forwarding); | 1403 | M_CP_INTOPT(x11_forwarding); |
1404 | M_CP_INTOPT(x11_use_localhost); | 1404 | M_CP_INTOPT(x11_use_localhost); |
1405 | M_CP_INTOPT(max_sessions); | 1405 | M_CP_INTOPT(max_sessions); |
1406 | M_CP_INTOPT(max_authtries); | ||
1406 | 1407 | ||
1407 | M_CP_STROPT(banner); | 1408 | M_CP_STROPT(banner); |
1408 | if (preauth) | 1409 | if (preauth) |
diff --git a/sshd_config.5 b/sshd_config.5 index 5ec007f15..0d41edf98 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -34,7 +34,7 @@ | |||
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.94 2008/06/15 16:55:38 dtucker Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.95 2008/06/15 16:58:40 dtucker Exp $ |
38 | .Dd $Mdocdate: June 15 2008 $ | 38 | .Dd $Mdocdate: June 15 2008 $ |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -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 MaxAuthTries , | ||
605 | .Cm MaxSessions , | 606 | .Cm MaxSessions , |
606 | .Cm PasswordAuthentication , | 607 | .Cm PasswordAuthentication , |
607 | .Cm PermitOpen , | 608 | .Cm PermitOpen , |