summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-26 00:22:57 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-26 00:22:57 +0000
commita95fd3f8ad53d2ac2fb26558e033bd5180131c77 (patch)
treed1bfc4531b68ebdedd27a07a88261dd04ef79dc4
parent2b3897c3ccbe028c99b1b3b79603845899d5c644 (diff)
- (bal) added back in error check for mmap(). I screwed up, Pointed
out by stevesk@
-rw-r--r--ChangeLog4
-rw-r--r--monitor_mm.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 727841238..fc188fd7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,8 @@
27 lightweight do_setusercontext after chroot() 27 lightweight do_setusercontext after chroot()
28 - (bal) Updated AIX package build. Patch by dtucker@zip.com.au 28 - (bal) Updated AIX package build. Patch by dtucker@zip.com.au
29 - (tim) [Makefile.in] fix test on installing ssh-rand-helper.8 29 - (tim) [Makefile.in] fix test on installing ssh-rand-helper.8
30 - (bal) added back in error check for mmap(). I screwed up, Pointed
31 out by stevesk@
30 32
3120020625 3320020625
32 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh 34 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh
@@ -1126,4 +1128,4 @@
1126 - (stevesk) entropy.c: typo in debug message 1128 - (stevesk) entropy.c: typo in debug message
1127 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1129 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1128 1130
1129$Id: ChangeLog,v 1.2283 2002/06/25 23:45:42 tim Exp $ 1131$Id: ChangeLog,v 1.2284 2002/06/26 00:22:57 mouring Exp $
diff --git a/monitor_mm.c b/monitor_mm.c
index c7662d807..ab4d5c957 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -87,6 +87,8 @@ mm_create(struct mm_master *mmalloc, size_t size)
87#ifdef HAVE_MMAP_ANON_SHARED 87#ifdef HAVE_MMAP_ANON_SHARED
88 address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED, 88 address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED,
89 -1, 0); 89 -1, 0);
90 if (address == MAP_FAILED)
91 fatal("mmap(%lu): %s", (u_long)size, strerror(errno));
90#else 92#else
91 fatal("%s: UsePrivilegeSeparation=yes and Compression=yes not supported", 93 fatal("%s: UsePrivilegeSeparation=yes and Compression=yes not supported",
92 __func__); 94 __func__);