summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-05 14:04:50 +1000
committerDamien Miller <djm@mindrot.org>2011-05-05 14:04:50 +1000
commitb2da7d185e1227501262449b634139349a3f736f (patch)
tree709cb8d28f01e3733272964a5d070fbda7c1430c
parent3fcdfd55a3a3a16342a4f110f2dc1ba998526e47 (diff)
- djm@cvs.openbsd.org 2011/03/10 11:34:25
[auth.h] allow GSSAPI authentication to detect when a server-side failure causes authentication failure and don't count such failures against MaxAuthTries; bz#1244 from simon AT sxw.org.uk; ok markus@ before lock
-rw-r--r--ChangeLog2
-rw-r--r--auth.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 62f026e2e..24b13ad0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@
10 Thanks to tim@ for testing on affected platforms. 10 Thanks to tim@ for testing on affected platforms.
11 - OpenBSD CVS Sync 11 - OpenBSD CVS Sync
12 - djm@cvs.openbsd.org 2011/03/10 02:52:57 12 - djm@cvs.openbsd.org 2011/03/10 02:52:57
13 [auth2-gss.c auth2.c] 13 [auth2-gss.c auth2.c auth.h]
14 allow GSSAPI authentication to detect when a server-side failure causes 14 allow GSSAPI authentication to detect when a server-side failure causes
15 authentication failure and don't count such failures against MaxAuthTries; 15 authentication failure and don't count such failures against MaxAuthTries;
16 bz#1244 from simon AT sxw.org.uk; ok markus@ before lock 16 bz#1244 from simon AT sxw.org.uk; ok markus@ before lock
diff --git a/auth.h b/auth.h
index 77317aee6..772a8c898 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.h,v 1.66 2010/05/07 11:30:29 djm Exp $ */ 1/* $OpenBSD: auth.h,v 1.67 2011/03/10 11:34:25 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -53,6 +53,7 @@ struct Authctxt {
53 int valid; /* user exists and is allowed to login */ 53 int valid; /* user exists and is allowed to login */
54 int attempt; 54 int attempt;
55 int failures; 55 int failures;
56 int server_caused_failure;
56 int force_pwchange; 57 int force_pwchange;
57 char *user; /* username sent by the client */ 58 char *user; /* username sent by the client */
58 char *service; 59 char *service;