summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--servconf.c10
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e19e8d6db..84212ea10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
5 Don't initialise compression buffers when compression=no in sshd_config; 5 Don't initialise compression buffers when compression=no in sshd_config;
6 ok Niels@ 6 ok Niels@
7 - ID sync for auth-passwd.c 7 - ID sync for auth-passwd.c
8 - (djm) Warn and disable compression on platforms which can't handle both
9 useprivilegeseparation=yes and compression=yes
8 10
920020620 1120020620
10 - (bal) Fixed AIX environment handling, use setpcred() instead of existing 12 - (bal) Fixed AIX environment handling, use setpcred() instead of existing
@@ -994,4 +996,4 @@
994 - (stevesk) entropy.c: typo in debug message 996 - (stevesk) entropy.c: typo in debug message
995 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 997 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
996 998
997$Id: ChangeLog,v 1.2236 2002/06/21 06:05:12 djm Exp $ 999$Id: ChangeLog,v 1.2237 2002/06/21 06:20:44 djm Exp $
diff --git a/servconf.c b/servconf.c
index b7f941ab5..fb6332c31 100644
--- a/servconf.c
+++ b/servconf.c
@@ -256,6 +256,16 @@ fill_default_server_options(ServerOptions *options)
256 /* Turn privilege separation on by default */ 256 /* Turn privilege separation on by default */
257 if (use_privsep == -1) 257 if (use_privsep == -1)
258 use_privsep = 1; 258 use_privsep = 1;
259
260#if !defined(HAVE_MMAP) || !defined(MAP_ANON)
261 if (use_privsep && options->compression == 1) {
262 error("This platform does not support both privilege "
263 "separation and compression");
264 error("Compression disabled");
265 options->compression = 0;
266 }
267#endif
268
259} 269}
260 270
261/* Keyword tokens. */ 271/* Keyword tokens. */