svn commit: r294909 - head/crypto/openssh

[Dag-Erling Smørgrav]

Author: des
Date: Wed Jan 27 13:40:44 2016
New Revision: 294909
URL: https://svnweb.freebsd.org/changeset/base/294909

Log:
  Switch UseDNS back on

Modified:
  head/crypto/openssh/FREEBSD-upgrade
  head/crypto/openssh/servconf.c
  head/crypto/openssh/sshd_config
  head/crypto/openssh/sshd_config.5

Modified: head/crypto/openssh/FREEBSD-upgrade
==============================================================================
--- head/crypto/openssh/FREEBSD-upgrade	Wed Jan 27 10:34:07 2016	(r294908)
+++ head/crypto/openssh/FREEBSD-upgrade	Wed Jan 27 13:40:44 2016	(r294909)
@@ -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
 

Modified: head/crypto/openssh/servconf.c
==============================================================================
--- head/crypto/openssh/servconf.c	Wed Jan 27 10:34:07 2016	(r294908)
+++ head/crypto/openssh/servconf.c	Wed Jan 27 13:40:44 2016	(r294909)
@@ -320,7 +320,7 @@ fill_default_server_options(ServerOption
 	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)

Modified: head/crypto/openssh/sshd_config
==============================================================================
--- head/crypto/openssh/sshd_config	Wed Jan 27 10:34:07 2016	(r294908)
+++ head/crypto/openssh/sshd_config	Wed Jan 27 13:40:44 2016	(r294909)
@@ -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

Modified: head/crypto/openssh/sshd_config.5
==============================================================================
--- head/crypto/openssh/sshd_config.5	Wed Jan 27 10:34:07 2016	(r294908)
+++ head/crypto/openssh/sshd_config.5	Wed Jan 27 13:40:44 2016	(r294909)
@@ -1541,8 +1541,8 @@ the resolved host name for the remote IP
 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