diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-07-01 02:32:17 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-07-01 12:35:31 +1000 |
| commit | 7de4b03a6e4071d454b72927ffaf52949fa34545 (patch) | |
| tree | 57329108e9ed65fa04663516002bd6390338febe /servconf.c | |
| parent | 1bf477d3cdf1a864646d59820878783d42357a1d (diff) | |
upstream commit
twiddle; (this commit marks the openssh-6.9 release)
Upstream-ID: 78500582819f61dd8adee36ec5cc9b9ac9351234
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index f0876e7cd..df93fc450 100644 --- a/servconf.c +++ b/servconf.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: servconf.c,v 1.273 2015/07/01 01:56:13 djm Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.274 2015/07/01 02:32:17 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| 4 | * All rights reserved | 4 | * All rights reserved |
| @@ -222,7 +222,7 @@ fill_default_server_options(ServerOptions *options) | |||
| 222 | if (options->key_regeneration_time == -1) | 222 | if (options->key_regeneration_time == -1) |
| 223 | options->key_regeneration_time = 3600; | 223 | options->key_regeneration_time = 3600; |
| 224 | if (options->permit_root_login == PERMIT_NOT_SET) | 224 | if (options->permit_root_login == PERMIT_NOT_SET) |
| 225 | options->permit_root_login = PERMIT_NO; | 225 | options->permit_root_login = PERMIT_YES; |
| 226 | if (options->ignore_rhosts == -1) | 226 | if (options->ignore_rhosts == -1) |
| 227 | options->ignore_rhosts = 1; | 227 | options->ignore_rhosts = 1; |
| 228 | if (options->ignore_user_known_hosts == -1) | 228 | if (options->ignore_user_known_hosts == -1) |