From bf4d31468166ff9c7213b935db107710e338159a Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Wed, 27 Jan 2016 13:40:44 +0000
Subject: Switch UseDNS back on

---
 crypto/openssh/FREEBSD-upgrade | 1 +
 crypto/openssh/servconf.c      | 2 +-
 crypto/openssh/sshd_config     | 2 +-
 crypto/openssh/sshd_config.5   | 6 ++++--
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'crypto')

diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index 8116235..7acd51f 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -117,6 +117,7 @@
       - PasswordAuthentication defaults to "no".
       - VersionAddendum defaults to "FreeBSD-YYYYMMDD".
       - PrivilegeSeparation defaults to "sandbox".
+      - UseDNS defaults to "yes".
 
 2) Modified client-side defaults
 
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index ff61471..6f5c07d 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -320,7 +320,7 @@ fill_default_server_options(ServerOptions *options)
 	if (options->max_sessions == -1)
 		options->max_sessions = DEFAULT_SESSIONS_MAX;
 	if (options->use_dns == -1)
-		options->use_dns = 0;
+		options->use_dns = 1;
 	if (options->client_alive_interval == -1)
 		options->client_alive_interval = 0;
 	if (options->client_alive_count_max == -1)
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 694654d..6ab7900 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -115,7 +115,7 @@
 #Compression delayed
 #ClientAliveInterval 0
 #ClientAliveCountMax 3
-#UseDNS no
+#UseDNS yes
 #PidFile /var/run/sshd.pid
 #MaxStartups 10:30:100
 #PermitTunnel no
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index 4a0f72d..9945fc9 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -1541,8 +1541,8 @@ the resolved host name for the remote IP address maps back to the
 very same IP address.
 .Pp
 If this option is set to
-.Dq no
-(the default) then only addresses and not host names may be used in
+.Dq no ,
+then only addresses and not host names may be used in
 .Pa ~/.ssh/known_hosts
 .Cm from
 and
@@ -1550,6 +1550,8 @@ and
 .Cm Match
 .Cm Host
 directives.
+The default is
+.Dq yes .
 .It Cm UseLogin
 Specifies whether
 .Xr login 1
-- 
cgit v1.1