summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authordjm <djm>2009-02-16 04:21:39 +0000
committerdjm <djm>2009-02-16 04:21:39 +0000
commitea23a8af2d56469b4cd1af63d3db1ea845a12903 (patch)
treecd017dd0013930739f81b37c6b33e2b977f841b8 /openbsd-compat
parent2b72856d34be6aed1a97ff11d0e6489b98c6a93f (diff)
downloadopenssh-ea23a8af2d56469b4cd1af63d3db1ea845a12903.tar.gz
- (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.
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/xmmap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c
index 23efe388..04c6babc 100644
--- a/openbsd-compat/xmmap.c
+++ b/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);