- dtucker@cvs.openbsd.org 2008/06/15 16:58:40

     [servconf.c sshd_config.5]
     Allow MaxAuthTries within a Match block.  ok djm@

diff --git a/ChangeLog b/ChangeLog
index 3f205477680ea6538c5e25e139dd0f88c213b7b1..f311a620a4b58f589870150c95eeb282d6456ab8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@
    - dtucker@cvs.openbsd.org 2008/06/15 16:55:38
      [sshd_config.5]
      MaxSessions is allowed in a Match block too
    - dtucker@cvs.openbsd.org 2008/06/15 16:55:38
      [sshd_config.5]
      MaxSessions is allowed in a Match block too

+   - dtucker@cvs.openbsd.org 2008/06/15 16:58:40
+     [servconf.c sshd_config.5]
+     Allow MaxAuthTries within a Match block.  ok djm@

 
 20080614
  - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction
 
 20080614
  - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction

diff --git a/servconf.c b/servconf.c
index 8f5ddbd3381c44dc906e417ec844e1794dd1122d..67e7d7db32dfef0ad600800855eff48e2908e27f 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.183 2008/06/10 23:06:19 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.184 2008/06/15 16:58:40 dtucker Exp $ */

 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved


@@ -398,7 +398,7 @@ static struct {
        { "gatewayports", sGatewayPorts, SSHCFG_ALL },
        { "subsystem", sSubsystem, SSHCFG_GLOBAL },
        { "maxstartups", sMaxStartups, SSHCFG_GLOBAL },
        { "gatewayports", sGatewayPorts, SSHCFG_ALL },
        { "subsystem", sSubsystem, SSHCFG_GLOBAL },
        { "maxstartups", sMaxStartups, SSHCFG_GLOBAL },

-       { "maxauthtries", sMaxAuthTries, SSHCFG_GLOBAL },
+       { "maxauthtries", sMaxAuthTries, SSHCFG_ALL },

        { "maxsessions", sMaxSessions, SSHCFG_ALL },
        { "banner", sBanner, SSHCFG_ALL },
        { "usedns", sUseDNS, SSHCFG_GLOBAL },
        { "maxsessions", sMaxSessions, SSHCFG_ALL },
        { "banner", sBanner, SSHCFG_ALL },
        { "usedns", sUseDNS, SSHCFG_GLOBAL },


@@ -1403,6 +1403,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth)
        M_CP_INTOPT(x11_forwarding);
        M_CP_INTOPT(x11_use_localhost);
        M_CP_INTOPT(max_sessions);
        M_CP_INTOPT(x11_forwarding);
        M_CP_INTOPT(x11_use_localhost);
        M_CP_INTOPT(max_sessions);

+       M_CP_INTOPT(max_authtries);

 
        M_CP_STROPT(banner);
        if (preauth)
 
        M_CP_STROPT(banner);
        if (preauth)

diff --git a/sshd_config.5 b/sshd_config.5
index f5db2253331e104b60973a7aaca898289459daec..cb24ac1f967b6b3b511cba7862a33596fff6f410 100644 (file)
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" (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.94 2008/06/15 16:55:38 dtucker Exp $
+.\" $OpenBSD: sshd_config.5,v 1.95 2008/06/15 16:58:40 dtucker Exp $

 .Dd $Mdocdate$
 .Dt SSHD_CONFIG 5
 .Os
 .Dd $Mdocdate$
 .Dt SSHD_CONFIG 5
 .Os


@@ -602,6 +602,7 @@ Available keywords are
 .Cm HostbasedAuthentication ,
 .Cm KbdInteractiveAuthentication ,
 .Cm KerberosAuthentication ,
 .Cm HostbasedAuthentication ,
 .Cm KbdInteractiveAuthentication ,
 .Cm KerberosAuthentication ,

+.Cm MaxAuthTries ,

 .Cm MaxSessions ,
 .Cm PasswordAuthentication ,
 .Cm PermitOpen ,
 .Cm MaxSessions ,
 .Cm PasswordAuthentication ,
 .Cm PermitOpen ,