summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-07-01 01:56:13 +0000
committerDamien Miller <djm@mindrot.org>2015-07-01 12:29:42 +1000
commit47aa7a0f8551b471fcae0447c1d78464f6dba869 (patch)
tree0119507448b0c8304225866a67f56486d5541e4f /servconf.c
parent984b064fe2a23733733262f88d2e1b2a1a501662 (diff)
downloadopenssh-git-47aa7a0f8551b471fcae0447c1d78464f6dba869.tar.gz
upstream commit
put back default PermitRootLogin=no Upstream-ID: 7bdedd5cead99c57ed5571f3b6b7840922d5f728
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c
index 63838935..f0876e7c 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)