From 3d5728a0f6874ce4efb16913a12963595070f3a9 Mon Sep 17 00:00:00 2001 From: "chris@openbsd.org" Date: Fri, 31 Jul 2015 15:38:09 +0000 Subject: upstream commit Allow PermitRootLogin to be overridden by config ok markus@ deeradt@ Upstream-ID: 5cf3e26ed702888de84e2dc9d0054ccf4d9125b4 --- servconf.c | 6 +++--- 1 file 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 @@ -/* $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 , 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) -- cgit v1.2.3