diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/servconf.c b/servconf.c index eccfbad48..427bdeef1 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.227 2012/06/19 18:25:27 markus Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.228 2012/07/10 02:19:15 djm Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -285,7 +285,7 @@ fill_default_server_options(ServerOptions *options) | |||
285 | options->version_addendum = xstrdup(""); | 285 | options->version_addendum = xstrdup(""); |
286 | /* Turn privilege separation on by default */ | 286 | /* Turn privilege separation on by default */ |
287 | if (use_privsep == -1) | 287 | if (use_privsep == -1) |
288 | use_privsep = PRIVSEP_ON; | 288 | use_privsep = PRIVSEP_NOSANDBOX; |
289 | 289 | ||
290 | #ifndef HAVE_MMAP | 290 | #ifndef HAVE_MMAP |
291 | if (use_privsep && options->compression == 1) { | 291 | if (use_privsep && options->compression == 1) { |
@@ -770,8 +770,9 @@ static const struct multistate multistate_gatewayports[] = { | |||
770 | { NULL, -1 } | 770 | { NULL, -1 } |
771 | }; | 771 | }; |
772 | static const struct multistate multistate_privsep[] = { | 772 | static const struct multistate multistate_privsep[] = { |
773 | { "sandbox", PRIVSEP_SANDBOX }, | 773 | { "yes", PRIVSEP_NOSANDBOX }, |
774 | { "yes", PRIVSEP_ON }, | 774 | { "sandbox", PRIVSEP_ON }, |
775 | { "nosandbox", PRIVSEP_NOSANDBOX }, | ||
775 | { "no", PRIVSEP_OFF }, | 776 | { "no", PRIVSEP_OFF }, |
776 | { NULL, -1 } | 777 | { NULL, -1 } |
777 | }; | 778 | }; |