diff options
author | chris@openbsd.org <chris@openbsd.org> | 2015-07-31 15:38:09 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-08-02 19:59:26 +1000 |
commit | 3d5728a0f6874ce4efb16913a12963595070f3a9 (patch) | |
tree | 92a7a87c81ff507f1888d64d7c51ba663adfd913 | |
parent | 6f941396b6835ad18018845f515b0c4fe20be21a (diff) |
upstream commit
Allow PermitRootLogin to be overridden by config
ok markus@ deeradt@
Upstream-ID: 5cf3e26ed702888de84e2dc9d0054ccf4d9125b4
-rw-r--r-- | servconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c index f5d564efa..f06e1748f 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.278 2015/07/30 19:23:02 deraadt Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.279 2015/07/31 15:38:09 chris 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 |
@@ -89,7 +89,7 @@ initialize_server_options(ServerOptions *options) | |||
89 | options->server_key_bits = -1; | 89 | options->server_key_bits = -1; |
90 | options->login_grace_time = -1; | 90 | options->login_grace_time = -1; |
91 | options->key_regeneration_time = -1; | 91 | options->key_regeneration_time = -1; |
92 | options->permit_root_login = PERMIT_NO_PASSWD; | 92 | options->permit_root_login = PERMIT_NOT_SET; |
93 | options->ignore_rhosts = -1; | 93 | options->ignore_rhosts = -1; |
94 | options->ignore_user_known_hosts = -1; | 94 | options->ignore_user_known_hosts = -1; |
95 | options->print_motd = -1; | 95 | options->print_motd = -1; |
@@ -224,7 +224,7 @@ fill_default_server_options(ServerOptions *options) | |||
224 | if (options->key_regeneration_time == -1) | 224 | if (options->key_regeneration_time == -1) |
225 | options->key_regeneration_time = 3600; | 225 | options->key_regeneration_time = 3600; |
226 | if (options->permit_root_login == PERMIT_NOT_SET) | 226 | if (options->permit_root_login == PERMIT_NOT_SET) |
227 | options->permit_root_login = PERMIT_NO; | 227 | options->permit_root_login = PERMIT_NO_PASSWD; |
228 | if (options->ignore_rhosts == -1) | 228 | if (options->ignore_rhosts == -1) |
229 | options->ignore_rhosts = 1; | 229 | options->ignore_rhosts = 1; |
230 | if (options->ignore_user_known_hosts == -1) | 230 | if (options->ignore_user_known_hosts == -1) |