summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--monitor_mm.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 82e06bec7..c2467c7d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
8 - (stevesk) remove configure support for poll.h; it was removed 8 - (stevesk) remove configure support for poll.h; it was removed
9 from sshd.c a long time ago. 9 from sshd.c a long time ago.
10 - (stevesk) --with-privsep-user; default sshd 10 - (stevesk) --with-privsep-user; default sshd
11 - (stevesk) wrap munmap() with HAVE_MMAP also.
11 12
1220020406 1320020406
13 - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann 14 - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann
@@ -8198,4 +8199,4 @@
8198 - Wrote replacements for strlcpy and mkdtemp 8199 - Wrote replacements for strlcpy and mkdtemp
8199 - Released 1.0pre1 8200 - Released 1.0pre1
8200 8201
8201$Id: ChangeLog,v 1.2038 2002/04/07 19:22:55 stevesk Exp $ 8202$Id: ChangeLog,v 1.2039 2002/04/07 22:36:49 stevesk Exp $
diff --git a/monitor_mm.c b/monitor_mm.c
index b9ea978a6..3231c8786 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -130,8 +130,13 @@ mm_destroy(struct mm_master *mm)
130 mm_freelist(mm->mmalloc, &mm->rb_free); 130 mm_freelist(mm->mmalloc, &mm->rb_free);
131 mm_freelist(mm->mmalloc, &mm->rb_allocated); 131 mm_freelist(mm->mmalloc, &mm->rb_allocated);
132 132
133#ifdef HAVE_MMAP
133 if (munmap(mm->address, mm->size) == -1) 134 if (munmap(mm->address, mm->size) == -1)
134 fatal("munmap(%p, %lu)", mm->address, (u_long)mm->size); 135 fatal("munmap(%p, %lu)", mm->address, (u_long)mm->size);
136#else
137 fatal("%s: UsePrivilegeSeparation=yes not supported",
138 __FUNCTION__);
139#endif
135 if (mm->mmalloc == NULL) 140 if (mm->mmalloc == NULL)
136 xfree(mm); 141 xfree(mm);
137 else 142 else