upstream commit

reset default PermitRootLogin to 'yes' (momentarily, for
 release)

Upstream-ID: cad8513527066e65dd7a1c16363d6903e8cefa24
This commit is contained in:
djm@openbsd.org 2015-07-01 01:55:00 +00:00 committed by Damien Miller
parent 66295e0e1b
commit d921082ed6
1 changed files with 2 additions and 2 deletions

View File

@ -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 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -222,7 +222,7 @@ fill_default_server_options(ServerOptions *options)
if (options->key_regeneration_time == -1) if (options->key_regeneration_time == -1)
options->key_regeneration_time = 3600; options->key_regeneration_time = 3600;
if (options->permit_root_login == PERMIT_NOT_SET) 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) if (options->ignore_rhosts == -1)
options->ignore_rhosts = 1; options->ignore_rhosts = 1;
if (options->ignore_user_known_hosts == -1) if (options->ignore_user_known_hosts == -1)