diff options
author | markus@openbsd.org <markus@openbsd.org> | 2016-08-13 17:47:40 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-08-14 11:19:14 +1000 |
commit | 6cb6dcffe1a2204ba9006de20f73255c268fcb6b (patch) | |
tree | 235267a1264f9363c39c4c0b11b59384e9acbdcf /auth.c | |
parent | 42d47adc5ad1187f22c726cbc52e71d6b1767ca2 (diff) |
upstream commit
remove ssh1 server code; ok djm@
Upstream-ID: c24c0c32c49b91740d5a94ae914fb1898ea5f534
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.115 2016/06/15 00:40:40 dtucker Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.116 2016/08/13 17:47:41 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -298,7 +298,7 @@ auth_log(Authctxt *authctxt, int authenticated, int partial, | |||
298 | else | 298 | else |
299 | authmsg = authenticated ? "Accepted" : "Failed"; | 299 | authmsg = authenticated ? "Accepted" : "Failed"; |
300 | 300 | ||
301 | authlog("%s %s%s%s for %s%.100s from %.200s port %d %s%s%s", | 301 | authlog("%s %s%s%s for %s%.100s from %.200s port %d ssh2%s%s", |
302 | authmsg, | 302 | authmsg, |
303 | method, | 303 | method, |
304 | submethod != NULL ? "/" : "", submethod == NULL ? "" : submethod, | 304 | submethod != NULL ? "/" : "", submethod == NULL ? "" : submethod, |
@@ -306,7 +306,6 @@ auth_log(Authctxt *authctxt, int authenticated, int partial, | |||
306 | authctxt->user, | 306 | authctxt->user, |
307 | ssh_remote_ipaddr(ssh), | 307 | ssh_remote_ipaddr(ssh), |
308 | ssh_remote_port(ssh), | 308 | ssh_remote_port(ssh), |
309 | compat20 ? "ssh2" : "ssh1", | ||
310 | authctxt->info != NULL ? ": " : "", | 309 | authctxt->info != NULL ? ": " : "", |
311 | authctxt->info != NULL ? authctxt->info : ""); | 310 | authctxt->info != NULL ? authctxt->info : ""); |
312 | free(authctxt->info); | 311 | free(authctxt->info); |
@@ -339,12 +338,11 @@ auth_maxtries_exceeded(Authctxt *authctxt) | |||
339 | struct ssh *ssh = active_state; /* XXX */ | 338 | struct ssh *ssh = active_state; /* XXX */ |
340 | 339 | ||
341 | error("maximum authentication attempts exceeded for " | 340 | error("maximum authentication attempts exceeded for " |
342 | "%s%.100s from %.200s port %d %s", | 341 | "%s%.100s from %.200s port %d ssh2", |
343 | authctxt->valid ? "" : "invalid user ", | 342 | authctxt->valid ? "" : "invalid user ", |
344 | authctxt->user, | 343 | authctxt->user, |
345 | ssh_remote_ipaddr(ssh), | 344 | ssh_remote_ipaddr(ssh), |
346 | ssh_remote_port(ssh), | 345 | ssh_remote_port(ssh)); |
347 | compat20 ? "ssh2" : "ssh1"); | ||
348 | packet_disconnect("Too many authentication failures"); | 346 | packet_disconnect("Too many authentication failures"); |
349 | /* NOTREACHED */ | 347 | /* NOTREACHED */ |
350 | } | 348 | } |