- (djm) Pull in fixes from -CURRENT:

   - (djm) Reintroduce pam_session call for non-pty sessions.
   - (djm) Remove redundant and incorrect test for max auth attempts in
     PAM kbdint code. Based on fix from Matthew Melvin
    <matthewm@webcentral.com.au>

3 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index d4baeba1..50102e2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20010627
+ - (djm) Pull in fixes from -CURRENT: 
+   - (djm) Reintroduce pam_session call for non-pty sessions.
+   - (djm) Remove redundant and incorrect test for max auth attempts in 
+     PAM kbdint code. Based on fix from Matthew Melvin 
+    <matthewm@webcentral.com.au>
+
 20010617
  - (djm) Pull in small fix from -CURRENT for session.c:
     typo, use pid not s->pid, mstone@cs.loyola.edu
@@ -5318,4 +5325,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1179.2.18 2001/06/17 03:40:50 djm Exp $
+$Id: ChangeLog,v 1.1179.2.19 2001/06/27 06:46:02 djm Exp $
diff --git a/auth2-pam.c b/auth2-pam.c
index 490921d8..3de29ad8 100644
--- a/auth2-pam.c
+++ b/auth2-pam.c
@@ -1,5 +1,5 @@
 #include "includes.h"
-RCSID("$Id: auth2-pam.c,v 1.10 2001/02/16 02:03:04 djm Exp $");
+RCSID("$Id: auth2-pam.c,v 1.10.8.1 2001/06/27 06:46:03 djm Exp $");
 
 #ifdef USE_PAM
 #include <security/pam_appl.h>
@@ -137,9 +137,6 @@ input_userauth_info_response_pam(int type, int plen, void *ctxt)
 	if (authctxt == NULL)
 		fatal("input_userauth_info_response_pam: no authentication context");
 
-	if (authctxt->attempt++ >= AUTH_FAIL_MAX)
-		packet_disconnect("too many failed userauth_requests");
-
 	nresp = packet_get_int();	/* Number of responses. */
 	debug("got %d responses", nresp);
 
diff --git a/session.c b/session.c
index 02adebb5..7b62f05d 100644
--- a/session.c
+++ b/session.c
@@ -457,6 +457,7 @@ do_exec_no_pty(Session *s, const char *command)
 	session_proctitle(s);
 
 #if defined(USE_PAM)
+	do_pam_session(s->pw->pw_name, NULL);
 	do_pam_setcred(1);
 #endif /* USE_PAM */