From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 1 Jul 2015 01:56:13 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47aa7a0f8551b471fcae0447c1d78464f6dba869;p=thirdparty%2Fopenssh-portable.git

upstream commit

put back default PermitRootLogin=no

Upstream-ID: 7bdedd5cead99c57ed5571f3b6b7840922d5f728
---

diff --git a/servconf.c b/servconf.c
index 638389354..f0876e7cd 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.272 2015/07/01 01:55:00 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.273 2015/07/01 01:56:13 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -222,7 +222,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_YES;
+		options->permit_root_login = PERMIT_NO;
 	if (options->ignore_rhosts == -1)
 		options->ignore_rhosts = 1;
 	if (options->ignore_user_known_hosts == -1)