diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-02-17 05:29:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-02-17 16:37:56 +1100 |
commit | c5c3f3279a0e4044b8de71b70d3570d692d0f29d (patch) | |
tree | 72b85707e4fd5bd40a9184a88d09e8eed5e29897 /servconf.c | |
parent | eb3f7337a651aa01d5dec019025e6cdc124ed081 (diff) |
upstream commit
make sandboxed privilege separation the default, not just
for new installs; "absolutely" deraadt@
Upstream-ID: 5221ef3b927d2df044e9aa3f5db74ae91743f69b
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c index 7bee5a17a..c0b6f6e65 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.284 2016/01/29 02:54:45 dtucker Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.285 2016/02/17 05:29:04 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 |
@@ -356,9 +356,9 @@ fill_default_server_options(ServerOptions *options) | |||
356 | 356 | ||
357 | assemble_algorithms(options); | 357 | assemble_algorithms(options); |
358 | 358 | ||
359 | /* Turn privilege separation on by default */ | 359 | /* Turn privilege separation and sandboxing on by default */ |
360 | if (use_privsep == -1) | 360 | if (use_privsep == -1) |
361 | use_privsep = PRIVSEP_NOSANDBOX; | 361 | use_privsep = PRIVSEP_ON; |
362 | 362 | ||
363 | #define CLEAR_ON_NONE(v) \ | 363 | #define CLEAR_ON_NONE(v) \ |
364 | do { \ | 364 | do { \ |