Bump versions in case we need to do another rel

- (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
    <[email protected]>

ChangeLog

@@ -1,3 +1,11 @@
+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 
+    <[email protected]>
+   - (markus) Unbreak -R forwarding for protocol 2
+
 20010617
  - (djm) Pull in small fix from -CURRENT for session.c:
     typo, use pid not s->pid, [email protected]
@@ -5318,4 +5326,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.20 2001/06/27 06:51:00 djm Exp $

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);
 

channels.c

@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.109 2001/04/17 12:55:03 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.109.2.2 2001/06/21 23:45:23 jason Exp $");
 
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
@@ -773,8 +773,9 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset)
 
 		rtype = (c->type == SSH_CHANNEL_RPORT_LISTENER) ?
 		    "forwarded-tcpip" : "direct-tcpip";
-		nextstate = (c->host_port == 0) ? SSH_CHANNEL_DYNAMIC :
-		    SSH_CHANNEL_OPENING;
+		nextstate = (c->host_port == 0 &&
+		    c->type != SSH_CHANNEL_RPORT_LISTENER) ?
+		    SSH_CHANNEL_DYNAMIC : SSH_CHANNEL_OPENING;
 
 		addrlen = sizeof(addr);
 		newsock = accept(c->sock, &addr, &addrlen);

contrib/caldera/openssh.spec

@@ -1,7 +1,7 @@
 %define askpass		1.2.0
 
 Name        	: openssh
-Version     	: 2.9p2
+Version     	: 2.9p3
 Release     	: 1
 Group       	: System/Network
 
@@ -281,4 +281,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.15.2.2 2001/06/17 04:06:19 djm Exp $
+$Id: openssh.spec,v 1.15.2.3 2001/06/27 06:52:04 djm Exp $

contrib/redhat/openssh.spec

@@ -1,5 +1,5 @@
 # Version of OpenSSH
-%define oversion 2.9p2
+%define oversion 2.9p3
 
 # Version of ssh-askpass
 %define aversion 1.2.0

contrib/suse/openssh.spec

@@ -1,6 +1,6 @@
 Summary: OpenSSH, a free Secure Shell (SSH) implementation
 Name: openssh
-Version: 2.9p2
+Version: 2.9p3
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz

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 */
 

version.h

@@ -1,3 +1,3 @@
 /* $OpenBSD: version.h,v 1.23 2001/04/24 16:43:16 markus Exp $ */
 
-#define SSH_VERSION	"OpenSSH_2.9p2"
+#define SSH_VERSION	"OpenSSH_2.9p3"