diff options
author | Sebastian Andrzej Siewior <sebastian@breakpoint.cc> | 2020-09-05 17:50:01 +0200 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-09-11 13:18:42 +1000 |
commit | 8372bff3a895b84fd78a81dc39da10928b662f5a (patch) | |
tree | 3a4aa556c608eefa61f7b595a680bbbdfed9d57a | |
parent | bbf20ac8065905f9cb9aeb8f1df57fcab52ee2fb (diff) |
Remove HAVE_MMAP and BROKEN_MMAP
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 HAVE_MMAP and BROKEN_MMAP bits.
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-rw-r--r-- | defines.h | 4 | ||||
-rw-r--r-- | servconf.c | 9 |
2 files changed, 0 insertions, 13 deletions
@@ -829,10 +829,6 @@ struct winsize { | |||
829 | # define getgroups(a,b) ((a)==0 && (b)==NULL ? NGROUPS_MAX : getgroups((a),(b))) | 829 | # define getgroups(a,b) ((a)==0 && (b)==NULL ? NGROUPS_MAX : getgroups((a),(b))) |
830 | #endif | 830 | #endif |
831 | 831 | ||
832 | #if defined(HAVE_MMAP) && defined(BROKEN_MMAP) | ||
833 | # undef HAVE_MMAP | ||
834 | #endif | ||
835 | |||
836 | #ifndef IOV_MAX | 832 | #ifndef IOV_MAX |
837 | # if defined(_XOPEN_IOV_MAX) | 833 | # if defined(_XOPEN_IOV_MAX) |
838 | # define IOV_MAX _XOPEN_IOV_MAX | 834 | # define IOV_MAX _XOPEN_IOV_MAX |
diff --git a/servconf.c b/servconf.c index 2ce04cf14..f08e37477 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -495,15 +495,6 @@ fill_default_server_options(ServerOptions *options) | |||
495 | options->auth_methods[0] = NULL; | 495 | options->auth_methods[0] = NULL; |
496 | options->num_auth_methods = 0; | 496 | options->num_auth_methods = 0; |
497 | } | 497 | } |
498 | |||
499 | #ifndef HAVE_MMAP | ||
500 | if (use_privsep && options->compression == 1) { | ||
501 | error("This platform does not support both privilege " | ||
502 | "separation and compression"); | ||
503 | error("Compression disabled"); | ||
504 | options->compression = 0; | ||
505 | } | ||
506 | #endif | ||
507 | } | 498 | } |
508 | 499 | ||
509 | /* Keyword tokens. */ | 500 | /* Keyword tokens. */ |