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
@@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.278 2015/07/30 19:23:02 deraadt Exp $ */ +/* $OpenBSD: servconf.c,v 1.279 2015/07/31 15:38:09 chris Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -89,7 +89,7 @@ initialize_server_options(ServerOptions *options) options->server_key_bits = -1; options->login_grace_time = -1; options->key_regeneration_time = -1; - options->permit_root_login = PERMIT_NO_PASSWD; + options->permit_root_login = PERMIT_NOT_SET; options->ignore_rhosts = -1; options->ignore_user_known_hosts = -1; options->print_motd = -1; @@ -224,7 +224,7 @@ fill_default_server_options(ServerOptions *options) if (options->key_regeneration_time == -1) options->key_regeneration_time = 3600; if (options->permit_root_login == PERMIT_NOT_SET) - options->permit_root_login = PERMIT_NO; + options->permit_root_login = PERMIT_NO_PASSWD; if (options->ignore_rhosts == -1) options->ignore_rhosts = 1; if (options->ignore_user_known_hosts == -1) |