Import of OpenSSH 3.4p1

[gssapi-openssh.git] / openssh / monitor_mm.c

diff --git a/openssh/monitor_mm.c b/openssh/monitor_mm.c
index 0076c4210d7972ba2a93250f192830972822b4b6..c363036e6720b288e9c946f45049e87a61cc65e8 100644 (file)
--- a/openssh/monitor_mm.c
+++ b/openssh/monitor_mm.c
@@ -84,13 +84,13 @@ mm_create(struct mm_master *mmalloc, size_t size)
         */
        mm->mmalloc = mmalloc;
 
-#if  defined(HAVE_MMAP) && defined(MAP_ANON)
+#ifdef HAVE_MMAP_ANON_SHARED
        address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED,
            -1, 0);
        if (address == MAP_FAILED)
                fatal("mmap(%lu): %s", (u_long)size, strerror(errno));
 #else
-       fatal("%s: UsePrivilegeSeparation=yes not supported",
+       fatal("%s: UsePrivilegeSeparation=yes and Compression=yes not supported",
            __func__);
 #endif
 
@@ -130,12 +130,12 @@ mm_destroy(struct mm_master *mm)
        mm_freelist(mm->mmalloc, &mm->rb_free);
        mm_freelist(mm->mmalloc, &mm->rb_allocated);
 
-#ifdef HAVE_MMAP
+#ifdef HAVE_MMAP_ANON_SHARED
        if (munmap(mm->address, mm->size) == -1)
                fatal("munmap(%p, %lu): %s", mm->address, (u_long)mm->size,
                    strerror(errno));
 #else
-       fatal("%s: UsePrivilegeSeparation=yes not supported",
+       fatal("%s: UsePrivilegeSeparation=yes and Compression=yes not supported",
            __func__);
 #endif
        if (mm->mmalloc == NULL)