Mercurial > dropbear
diff svr-runopts.c @ 1445:a3a96dbf9a58
Use MAX_AUTH_TRIES rather than DEFAULT_AUTH_TRIES, don't limit argument range
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 27 Jun 2017 22:20:38 +0800 |
| parents | 517c67cbcd31 |
| children | 4afde04f0607 2d450c1056e3 |
line wrap: on
line diff
--- a/svr-runopts.c Tue Jun 27 22:18:18 2017 +0800 +++ b/svr-runopts.c Tue Jun 27 22:20:38 2017 +0800 @@ -73,7 +73,7 @@ "-g Disable password logins for root\n" "-B Allow blank password logins\n" #endif - "-T <1 to %d> Maximum authentication tries (default %d)\n" + "-T Maximum authentication tries (default %d)\n" #if DROPBEAR_SVR_LOCALTCPFWD "-j Disable local port forwarding\n" #endif @@ -108,7 +108,7 @@ #if DROPBEAR_ECDSA ECDSA_PRIV_FILENAME, #endif - MAX_AUTH_TRIES, DEFAULT_AUTH_TRIES, + MAX_AUTH_TRIES, DROPBEAR_MAX_PORTS, DROPBEAR_DEFPORT, DROPBEAR_PIDFILE, DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE, DEFAULT_IDLE_TIMEOUT); } @@ -135,7 +135,7 @@ svr_opts.noauthpass = 0; svr_opts.norootpass = 0; svr_opts.allowblankpass = 0; - svr_opts.maxauthtries = DEFAULT_AUTH_TRIES; + svr_opts.maxauthtries = MAX_AUTH_TRIES; svr_opts.inetdmode = 0; svr_opts.portcount = 0; svr_opts.hostkey = NULL; @@ -341,8 +341,8 @@ if (maxauthtries_arg) { unsigned int val = 0; - if (m_str_to_uint(maxauthtries_arg, &val) == DROPBEAR_FAILURE || - val == 0 || val > MAX_AUTH_TRIES) { + if (m_str_to_uint(maxauthtries_arg, &val) == DROPBEAR_FAILURE + || val == 0) { dropbear_exit("Bad maxauthtries '%s'", maxauthtries_arg); } svr_opts.maxauthtries = val;