[PATCH 1/5] Remove HAVE_MMAP and BROKEN_MMAP

Sebastian Andrzej Siewior openssh at ml.breakpoint.cc
Sun Sep 6 01:50:01 AEST 2020


From: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>

BROKEN_MMAP is no longer defined since commit
   1cfd5c06efb12 ("Remove portability support for mmap")

this commit also removed other HAVE_MMAP user. I didn't find anything
that defines HAVE_MMAP. The check does not trigger because compression
on server side is by default COMP_DELAYED (2) so it never triggers.

Remove remaining BROKEN_MMAP and BROKEN_MMAP bits.

Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
---
 defines.h  | 4 ----
 servconf.c | 9 ---------
 2 files changed, 13 deletions(-)

diff --git a/defines.h b/defines.h
index b8ea88b2d21cb..79dcb507feeb5 100644
--- a/defines.h
+++ b/defines.h
@@ -829,10 +829,6 @@ struct winsize {
 # define getgroups(a,b) ((a)==0 && (b)==NULL ? NGROUPS_MAX : getgroups((a),(b)))
 #endif
 
-#if defined(HAVE_MMAP) && defined(BROKEN_MMAP)
-# undef HAVE_MMAP
-#endif
-
 #ifndef IOV_MAX
 # if defined(_XOPEN_IOV_MAX)
 #  define	IOV_MAX		_XOPEN_IOV_MAX
diff --git a/servconf.c b/servconf.c
index 2ce04cf14031c..f08e37477957a 100644
--- a/servconf.c
+++ b/servconf.c
@@ -495,15 +495,6 @@ fill_default_server_options(ServerOptions *options)
 		options->auth_methods[0] = NULL;
 		options->num_auth_methods = 0;
 	}
-
-#ifndef HAVE_MMAP
-	if (use_privsep && options->compression == 1) {
-		error("This platform does not support both privilege "
-		    "separation and compression");
-		error("Compression disabled");
-		options->compression = 0;
-	}
-#endif
 }
 
 /* Keyword tokens. */
-- 
2.28.0



More information about the openssh-unix-dev mailing list