OpenSSH 2.5.0p1

[Tim Rice]

On Fri, 16 Feb 2001 mouring at etoh.eviladmin.org wrote:

> 
> I guess what needs to be asked... Is what needs to OCCUR in the next 3
> to 4 days to assure we have a stable project on majority of the platforms?

Attached is a patch that fixes SCO Open Server 3

It configures/builds fine without & with tcp-wrapers on
Solaris 8
UnixWare 2.03
UnixWare 2.1.3
UnixWare 7.1.0
SCO 5.0.4
Caldera sDesktop 2.4

> 
> - Ben
> 
> 

-- 
Tim Rice				Multitalents	(707) 887-1469
tim at multitalents.net

-------------- next part --------------
--- openssh_cvs/configure.in.old	Fri Feb 16 18:15:18 2001
+++ openssh_cvs/configure.in	Fri Feb 16 18:39:16 2001
@@ -592,10 +592,10 @@
 
 	for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
 		if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
-			LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
+			LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
 			CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
 			if test ! -z "$need_dash_r" ; then
-				LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
+				LDFLAGS="$LDFLAGS -R$ssldir/lib"
 			fi
 		else
 			LDFLAGS="$saved_LDFLAGS"
@@ -645,12 +645,12 @@
 
 	if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
 		CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
-		LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
+		LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
 		if test ! -z "$need_dash_r" ; then
-			LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
+			LDFLAGS="$LDFLAGS -R$ssldir/lib"
 		fi
 		if test ! -z "$blibpath" ; then
-			blibpath="$blibpath:$ssldir:$ssldir/lib"
+			blibpath="$blibpath:$ssldir/lib"
 		fi
 	fi
 fi
--- openssh_cvs/misc.c.old	Fri Feb 16 18:15:19 2001
+++ openssh_cvs/misc.c	Fri Feb 16 19:07:03 2001
@@ -108,8 +108,10 @@
 		memset(&sa, 0, sizeof sa);
 		sigemptyset(&sa.sa_mask);
 		sa.sa_flags = 0;
+#ifdef SA_RESTART
 		if (sig == SIGCHLD)
 			sa.sa_flags |= SA_RESTART;
+#endif
 		sa.sa_handler = act;
 		if (sigaction(sig, &sa, 0) == -1)
 			return (mysig_t) -1;
--- openssh_cvs/sftp-client.c.old	Fri Feb 16 18:15:39 2001
+++ openssh_cvs/sftp-client.c	Fri Feb 16 19:37:00 2001
@@ -662,7 +662,11 @@
 	status = do_close(fd_in, fd_out, handle, handle_len);
 
 	/* Override umask and utimes if asked */
+#ifdef HAVE_FCHMOD
 	if (pflag && fchmod(local_fd, mode) == -1)
+#else /* HAVE_FCHMOD */
+	if (pflag && chmod(local_path, mode) == -1)
+#endif /* HAVE_FCHMOD */
 		error("Couldn't set mode on \"%s\": %s", local_path,
 		    strerror(errno));
 	if (pflag && (a->flags & SSH2_FILEXFER_ATTR_ACMODTIME)) {