- dtucker@cvs.openbsd.org 2004/05/23 23:59:53

     [auth.c auth.h auth1.c auth2.c servconf.c servconf.h sshd_config sshd_config.5]
     Add MaxAuthTries sshd config option; ok markus@

1 files changed, 11 insertions, 2 deletions

diff --git a/servconf.c b/servconf.c
index 467ad64e8..ef8651651 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.132 2004/05/08 00:01:37 deraadt Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.133 2004/05/23 23:59:53 dtucker Exp $");
 
 #include "ssh.h"
 #include "log.h"
@@ -94,6 +94,7 @@ initialize_server_options(ServerOptions *options)
         options->max_startups_begin = -1;
         options->max_startups_rate = -1;
         options->max_startups = -1;
+        options->max_authtries = -1;
         options->banner = NULL;
         options->use_dns = -1;
         options->client_alive_interval = -1;
@@ -212,6 +213,8 @@ fill_default_server_options(ServerOptions *options)
                 options->max_startups_rate = 100;               /* 100% */
         if (options->max_startups_begin == -1)
                 options->max_startups_begin = options->max_startups;
+        if (options->max_authtries == -1)
+                options->max_authtries = DEFAULT_AUTH_FAIL_MAX;
         if (options->use_dns == -1)
                 options->use_dns = 1;
         if (options->client_alive_interval == -1)
@@ -262,7 +265,8 @@ typedef enum {
         sPermitUserEnvironment, sUseLogin, sAllowTcpForwarding, sCompression,
         sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
         sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,
-        sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups,
+        sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem,
+        sMaxStartups, sMaxAuthTries,
         sBanner, sUseDNS, sHostbasedAuthentication,
         sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
         sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
@@ -357,6 +361,7 @@ static struct {
         { "gatewayports", sGatewayPorts },
         { "subsystem", sSubsystem },
         { "maxstartups", sMaxStartups },
+        { "maxauthtries", sMaxAuthTries },
         { "banner", sBanner },
         { "usedns", sUseDNS },
         { "verifyreversemapping", sDeprecated },
@@ -869,6 +874,10 @@ parse_flag:
                         options->max_startups = options->max_startups_begin;
                 break;
 
+        case sMaxAuthTries:
+                intptr = &options->max_authtries;
+                goto parse_int;
+
         case sBanner:
                 charptr = &options->banner;
                 goto parse_filename;