- (stevesk) wrap munmap() with HAVE_MMAP also.

diff --git a/ChangeLog b/ChangeLog
index 0581652a3dd9fdcffd7dfa2bb791e937db1b44ba..35673792edd3403667f9f1f5c8cc307d1da03fbe 100644 (file)
--- 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 

diff --git a/monitor_mm.c b/monitor_mm.c
index b9ea978a6604c3074163f77b2ae2c740a74f5a5b..3231c8786505faa1079bbc7188b863254744327e 100644 (file)
--- 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