- (djm) Warn and disable compression on platforms which can't handle both

   useprivilegeseparation=yes and compression=yes

diff --git a/ChangeLog b/ChangeLog
index 0a278e6ed478c9f60186b5a901e1ac7a62d71835..9d3726001e098d1fecd4ca9f00b2e837acb46472 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
      Don't initialise compression buffers when compression=no in sshd_config;
      ok Niels@
   - ID sync for auth-passwd.c
+ - (djm) Warn and disable compression on platforms which can't handle both
+   useprivilegeseparation=yes and compression=yes
 
 20020620
  - (bal) Fixed AIX environment handling, use setpcred() instead of existing

diff --git a/servconf.c b/servconf.c
index b7f941ab5aed9801fa4d561efe45b8160d00a0e0..fb6332c31b6973f2779ec3f9cc8172dcb23d65e8 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -256,6 +256,16 @@ fill_default_server_options(ServerOptions *options)
        /* Turn privilege separation on by default */
        if (use_privsep == -1)
                use_privsep = 1;
+
+#if !defined(HAVE_MMAP) || !defined(MAP_ANON)
+       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. */