diff options
author | Damien Miller <djm@mindrot.org> | 2001-06-27 15:36:43 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-06-27 15:36:43 +1000 |
commit | ec9868aa3cc83dc0723c038cc02250dbdaed0110 (patch) | |
tree | 459d70f65a7c7e16de43b6b2f2af347eb9165b00 | |
parent | 665af9cae7850c9df87f98c6604564652857d9ba (diff) |
- (djm) Remove redundant and incorrect test for max auth attempts in
PAM kbdint code. Based on fix from Matthew Melvin
<matthewm@webcentral.com.au>
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth2-pam.c | 5 |
2 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,8 @@ | |||
1 | 20010627 | 1 | 20010627 |
2 | - (djm) Reintroduce pam_session call for non-pty sessions. | 2 | - (djm) Reintroduce pam_session call for non-pty sessions. |
3 | - (djm) Remove redundant and incorrect test for max auth attempts in | ||
4 | PAM kbdint code. Based on fix from Matthew Melvin | ||
5 | <matthewm@webcentral.com.au> | ||
3 | 6 | ||
4 | 20010625 | 7 | 20010625 |
5 | - OpenBSD CVS Sync | 8 | - OpenBSD CVS Sync |
@@ -5794,4 +5797,4 @@ | |||
5794 | - Wrote replacements for strlcpy and mkdtemp | 5797 | - Wrote replacements for strlcpy and mkdtemp |
5795 | - Released 1.0pre1 | 5798 | - Released 1.0pre1 |
5796 | 5799 | ||
5797 | $Id: ChangeLog,v 1.1326 2001/06/26 23:34:15 djm Exp $ | 5800 | $Id: ChangeLog,v 1.1327 2001/06/27 05:36:43 djm Exp $ |
diff --git a/auth2-pam.c b/auth2-pam.c index 490921d84..cb32ae6e4 100644 --- a/auth2-pam.c +++ b/auth2-pam.c | |||
@@ -1,5 +1,5 @@ | |||
1 | #include "includes.h" | 1 | #include "includes.h" |
2 | RCSID("$Id: auth2-pam.c,v 1.10 2001/02/16 02:03:04 djm Exp $"); | 2 | RCSID("$Id: auth2-pam.c,v 1.11 2001/06/27 05:36:44 djm Exp $"); |
3 | 3 | ||
4 | #ifdef USE_PAM | 4 | #ifdef USE_PAM |
5 | #include <security/pam_appl.h> | 5 | #include <security/pam_appl.h> |
@@ -137,9 +137,6 @@ input_userauth_info_response_pam(int type, int plen, void *ctxt) | |||
137 | if (authctxt == NULL) | 137 | if (authctxt == NULL) |
138 | fatal("input_userauth_info_response_pam: no authentication context"); | 138 | fatal("input_userauth_info_response_pam: no authentication context"); |
139 | 139 | ||
140 | if (authctxt->attempt++ >= AUTH_FAIL_MAX) | ||
141 | packet_disconnect("too many failed userauth_requests"); | ||
142 | |||
143 | nresp = packet_get_int(); /* Number of responses. */ | 140 | nresp = packet_get_int(); /* Number of responses. */ |
144 | debug("got %d responses", nresp); | 141 | debug("got %d responses", nresp); |
145 | 142 | ||