diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2015-02-02 01:57:44 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-02-03 11:06:15 +1100 |
commit | 3cd5103c1e1aaa59bd66f7f52f6ebbcd5deb12f9 (patch) | |
tree | 9648b8c4622cc4531dacc6817ca1a6044a74f726 /servconf.c | |
parent | 6049a548a8a68ff0bbe581ab1748ea6a59ecdc38 (diff) |
upstream commit
increasing encounters with difficult DNS setups in
darknets has convinced me UseDNS off by default is better ok djm
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 475076bf2..318546290 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.259 2015/01/16 06:40:12 deraadt Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.260 2015/02/02 01:57:44 deraadt Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -308,7 +308,7 @@ fill_default_server_options(ServerOptions *options) | |||
308 | if (options->max_sessions == -1) | 308 | if (options->max_sessions == -1) |
309 | options->max_sessions = DEFAULT_SESSIONS_MAX; | 309 | options->max_sessions = DEFAULT_SESSIONS_MAX; |
310 | if (options->use_dns == -1) | 310 | if (options->use_dns == -1) |
311 | options->use_dns = 1; | 311 | options->use_dns = 0; |
312 | if (options->client_alive_interval == -1) | 312 | if (options->client_alive_interval == -1) |
313 | options->client_alive_interval = 0; | 313 | options->client_alive_interval = 0; |
314 | if (options->client_alive_count_max == -1) | 314 | if (options->client_alive_count_max == -1) |