summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-07-01 01:55:00 +0000
committerDamien Miller <djm@mindrot.org>2015-07-01 11:58:35 +1000
commitd921082ed670f516652eeba50705e1e9f6325346 (patch)
treecd03f877e3c05cfd5b2e3351df7480d3f34e0439
parent66295e0e1ba860e527f191b6325d2d77dec4dbce (diff)
upstream commit
reset default PermitRootLogin to 'yes' (momentarily, for release) Upstream-ID: cad8513527066e65dd7a1c16363d6903e8cefa24
-rw-r--r--servconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c
index eb32db0f..63838935 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.271 2015/05/22 03:50:02 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.272 2015/07/01 01:55:00 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_NO;
+ options->permit_root_login = PERMIT_YES;
if (options->ignore_rhosts == -1)
options->ignore_rhosts = 1;
if (options->ignore_user_known_hosts == -1)