summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-07-04 12:53:23 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-07-04 12:53:23 +1000
commit7c99b1ceda9f6bfb1dc36bae30de0c6a49c6ec69 (patch)
treebf4298c69941d90bab1bfe99deef0803c5b96906
parent4230a5dc305d1b39bc118befcc1ccfe933281b75 (diff)
- djm@cvs.openbsd.org 2008/07/02 13:30:34
[auth2.c] really really remove the freebie "none" auth try for protocol 2
-rw-r--r--ChangeLog8
-rw-r--r--auth2.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 873e1459d..6f69442f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120080704
2 - (dtucker) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2008/07/02 13:30:34
4 [auth2.c]
5 really really remove the freebie "none" auth try for protocol 2
6
120080702 720080702
2 - (dtucker) OpenBSD CVS Sync 8 - (dtucker) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2008/06/30 08:05:59 9 - djm@cvs.openbsd.org 2008/06/30 08:05:59
@@ -4532,4 +4538,4 @@
4532 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4538 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4533 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4539 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4534 4540
4535$Id: ChangeLog,v 1.5048 2008/07/02 12:56:09 dtucker Exp $ 4541$Id: ChangeLog,v 1.5049 2008/07/04 02:53:23 dtucker Exp $
diff --git a/auth2.c b/auth2.c
index 31f01f9fb..4b96c652f 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.117 2008/07/02 12:36:39 djm Exp $ */ 1/* $OpenBSD: auth2.c,v 1.118 2008/07/02 13:30:34 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -333,7 +333,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method)
333 /* now we can break out */ 333 /* now we can break out */
334 authctxt->success = 1; 334 authctxt->success = 1;
335 } else { 335 } else {
336 if (++authctxt->failures > options.max_authtries) { 336 if (++authctxt->failures >= options.max_authtries) {
337#ifdef SSH_AUDIT_EVENTS 337#ifdef SSH_AUDIT_EVENTS
338 PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES)); 338 PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES));
339#endif 339#endif