- (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]

[regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled
   interop tests from FATAL error to a warning. Allows some interop
   tests to proceed if others are missing necessary prerequisites.

ChangeLog

@@ -1,3 +1,9 @@
+20090216
+ - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]
+   [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled
+   interop tests from FATAL error to a warning. Allows some interop
+   tests to proceed if others are missing necessary prerequisites.
+
 20090214
  - (djm) OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2009/02/02 11:15:14
@@ -5163,5 +5169,5 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5195 2009/02/14 07:00:52 djm Exp $
+$Id: ChangeLog,v 1.5196 2009/02/16 04:21:39 djm Exp $
 

openbsd-compat/xmmap.c

@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: xmmap.c,v 1.14 2007/06/11 02:52:24 djm Exp $ */
+/* $Id: xmmap.c,v 1.15 2009/02/16 04:21:40 djm Exp $ */
 
 #include "includes.h"
 
@@ -71,7 +71,8 @@ xmmap(size_t size)
 			fatal("mkstemp(\"%s\"): %s",
 			    MM_SWAP_TEMPLATE, strerror(errno));
 		unlink(tmpname);
-		ftruncate(tmpfd, size);
+		if (ftruncate(tmpfd, size) != 0)
+			fatal("%s: ftruncate: %s", __func__, strerror(errno));
 		address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED,
 		    tmpfd, (off_t)0);
 		close(tmpfd);

regress/conch-ciphers.sh

@@ -7,7 +7,8 @@ DATA=/bin/ls
 COPY=${OBJ}/copy
 
 if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then
-	fatal "conch interop tests not enabled"
+	echo "conch interop tests not enabled"
+	exit 0
 fi
 
 start_sshd

regress/putty-ciphers.sh

@@ -7,7 +7,8 @@ DATA=/bin/ls
 COPY=${OBJ}/copy
 
 if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
-	fatal "putty interop tests not enabled"
+	echo "putty interop tests not enabled"
+	exit 0
 fi
 
 for c in aes blowfish 3des arcfour aes128-ctr aes192-ctr aes256-ctr ; do

regress/putty-kex.sh

@@ -7,7 +7,8 @@ DATA=/bin/ls
 COPY=${OBJ}/copy
 
 if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
-	fatal "putty interop tests not enabled"
+	echo "putty interop tests not enabled"
+	exit 0
 fi
 
 for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do

regress/putty-transfer.sh

@@ -7,7 +7,8 @@ DATA=/bin/ls
 COPY=${OBJ}/copy
 
 if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
-	fatal "putty interop tests not enabled"
+	echo "putty interop tests not enabled"
+	exit 0
 fi
 
 # XXX support protocol 1 too