From 265c9d00c37fcce40376db1d553b618a620aa8b7 Mon Sep 17 00:00:00 2001 From: Kevin Steves Date: Sun, 7 Apr 2002 22:36:49 +0000 Subject: - (stevesk) wrap munmap() with HAVE_MMAP also. --- ChangeLog | 3 ++- monitor_mm.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 82e06bec7..c2467c7d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ - (stevesk) remove configure support for poll.h; it was removed from sshd.c a long time ago. - (stevesk) --with-privsep-user; default sshd + - (stevesk) wrap munmap() with HAVE_MMAP also. 20020406 - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann @@ -8198,4 +8199,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2038 2002/04/07 19:22:55 stevesk Exp $ +$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) mm_freelist(mm->mmalloc, &mm->rb_free); mm_freelist(mm->mmalloc, &mm->rb_allocated); +#ifdef HAVE_MMAP if (munmap(mm->address, mm->size) == -1) fatal("munmap(%p, %lu)", mm->address, (u_long)mm->size); +#else + fatal("%s: UsePrivilegeSeparation=yes not supported", + __FUNCTION__); +#endif if (mm->mmalloc == NULL) xfree(mm); else -- cgit v1.2.3