2.5.2p2

suggested fix from Mike Battersby <[email protected]>

ChangeLog

@@ -1,3 +1,18 @@
+20010322
+ - (djm) Better AIX no tty fix, spotted by Gert Doering <[email protected]>
+ - (djm) Released 2.5.2p2
+
+20010321
+ - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve 
+   VanDevender <[email protected]>
+ - (djm) Make sure pam_retval is initialised on call to pam_end. Patch
+   from Solar Designer <[email protected]>
+ - (djm) Don't loop forever when changing password via PAM. Patch
+   from Solar Designer <[email protected]>
+ - (djm) Generate config files before build
+ - (djm) Correctly handle SIA and AIX when no tty present. Spotted and
+   suggested fix from Mike Battersby <[email protected]>
+
 20010320
  - (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS).
  - (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS).
@@ -13,6 +28,8 @@
  - (djm) Release 2.5.2p1
 - [email protected] 2001/03/19 18:33:47 [defines.h]
   change S_ISLNK macro to work for UnixWare 2.03
+- [email protected] 2001/03/19 20:45:11 [openbsd-compat/glob.c]
+  add get_arg_max(). Use sysconf() if ARG_MAX is not defined
 
 20010319
  - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to 
@@ -4643,4 +4660,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.992 2001/03/20 02:31:44 tim Exp $
+$Id: ChangeLog,v 1.991.2.6 2001/03/22 05:04:12 djm Exp $

Makefile.in

@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.161 2001/03/14 00:39:46 djm Exp $
+# $Id: Makefile.in,v 1.161.2.1 2001/03/21 02:12:12 djm Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -73,7 +73,7 @@ PATHSUBS	= \
 
 FIXPATHSCMD	= $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
 
-all: $(TARGETS) $(CONFIGFILES)
+all: $(CONFIGFILES) $(TARGETS) 
 
 manpages: $(MANPAGES)
 

TODO

@@ -1,6 +1,9 @@
 Programming:
 - Grep for 'XXX' comments and fix
 
+- Link order is incorrect for some systems using Kerberos 4 and AFS. Result
+is multiple inclusion of DES symbols.
+
 - Integrate contrib/mdoc2man.pl so platforms which only have the troff 
   'an' macros can have readable manpages.
 
@@ -79,4 +82,4 @@ Packaging:
 - HP-UX: Provide DEPOT package scripts.
   ([email protected])
 
-$Id: TODO,v 1.38 2001/03/19 14:58:47 stevesk Exp $
+$Id: TODO,v 1.38.2.1 2001/03/21 02:12:12 djm Exp $

auth-pam.c

@@ -33,7 +33,7 @@
 #include "canohost.h"
 #include "readpass.h"
 
-RCSID("$Id: auth-pam.c,v 1.31 2001/02/28 22:18:58 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.31.2.1 2001/03/21 02:12:13 djm Exp $");
 
 #define NEW_AUTHTOK_MSG \
 	"Warning: Your password has expired, please change it now"
@@ -172,7 +172,7 @@ static int do_pam_conversation(int num_msg, const struct pam_message **msg,
 /* Called at exit to cleanly shutdown PAM */
 void do_pam_cleanup_proc(void *context)
 {
-	int pam_retval;
+	int pam_retval = PAM_SUCCESS;
 
 	if (__pamh && session_opened) {
 		pam_retval = pam_close_session(__pamh, 0);
@@ -326,14 +326,10 @@ void do_pam_chauthtok(void)
 
 	if (password_change_required) {
 		pamstate = OTHER;
-		/* XXX: should we really loop forever? */
-		do {
-			pam_retval = pam_chauthtok(__pamh, 
-			    PAM_CHANGE_EXPIRED_AUTHTOK);
-			if (pam_retval != PAM_SUCCESS)
-				log("PAM pam_chauthtok failed[%d]: %.200s",
-				    pam_retval, PAM_STRERROR(__pamh, pam_retval));
-		} while (pam_retval != PAM_SUCCESS);
+		pam_retval = pam_chauthtok(__pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
+		if (pam_retval != PAM_SUCCESS)
+			fatal("PAM pam_chauthtok failed[%d]: %.200s",
+			    pam_retval, PAM_STRERROR(__pamh, pam_retval));
 	}
 }
 

contrib/caldera/openssh.spec

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

contrib/redhat/openssh.spec

@@ -1,5 +1,5 @@
 # Version of OpenSSH
-%define oversion 2.5.2p1
+%define oversion 2.5.2p2
 
 # 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.5.2p1
+Version: 2.5.2p2
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz

defines.h

@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.61 2001/03/20 02:31:45 tim Exp $ */
+/* $Id: defines.h,v 1.60.2.1 2001/03/20 02:49:22 tim Exp $ */
 
 /* Some platforms need this for the _r() functions */
 #if !defined(_REENTRANT) && !defined(SNI)

openbsd-compat/glob.c

@@ -37,6 +37,18 @@
 #include "includes.h"
 #include <ctype.h>
 
+long
+get_arg_max()
+{
+#ifdef ARG_MAX
+	return(ARG_MAX);
+#elif defined(HAVE_SYSCONF) && defined(_SC_ARG_MAX)
+	return(sysconf(_SC_ARG_MAX));
+#else
+	return(256); /* XXX: arbitrary */
+#endif
+}
+
 #if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \
     !defined(GLOB_HAS_GL_MATCHC)
 
@@ -689,7 +701,7 @@ globextend(path, pglob, limitp)
 	pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
 
 	if ((pglob->gl_flags & GLOB_LIMIT) &&
-	    newsize + *limitp >= ARG_MAX) {
+	    newsize + *limitp >= (u_int) get_arg_max()) {
 		errno = 0;
 		return(GLOB_NOSPACE);
 	}

session.c

@@ -1053,7 +1053,7 @@ do_child(Session *s, const char *command)
 	   switch, so we let login(1) to this for us. */
 	if (!options.use_login) {
 #ifdef HAVE_OSF_SIA
-		session_setup_sia(pw->pw_name, ttyname);
+		session_setup_sia(pw->pw_name, s->ttyfd == -1 ? NULL : s->tty);
 #else /* HAVE_OSF_SIA */
 #ifdef HAVE_CYGWIN
 		if (is_winnt) {
@@ -1134,10 +1134,12 @@ do_child(Session *s, const char *command)
 			 * other stuff is stored - a few applications
 			 * actually use this and die if it's not set
 			 */
-			cp = xmalloc(22 + strlen(ttyname) + 
+			if (s->ttyfd == -1)
+				s->tty[0] = '\0';
+			cp = xmalloc(22 + strlen(s->tty) + 
 			    2 * strlen(pw->pw_name));
 			i = sprintf(cp, "LOGNAME=%s%cNAME=%s%cTTY=%s%c%c",
-			    pw->pw_name, 0, pw->pw_name, 0, ttyname, 0,0);
+			    pw->pw_name, 0, pw->pw_name, 0, s->tty, 0, 0);
 			if (usrinfo(SETUINFO, cp, i) == -1)
 				fatal("Couldn't set usrinfo: %s", 
 				    strerror(errno));

version.h

@@ -1,3 +1,3 @@
 /* $OpenBSD: version.h,v 1.19 2001/02/19 10:35:23 markus Exp $ */
   
-#define SSH_VERSION	"OpenSSH_2.5.2p1"
+#define SSH_VERSION	"OpenSSH_2.5.2p2"