[src/trunk]: src/crypto/external/bsd/openssh/dist Move NetBSD.org-specific en...

[kim <kim%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e58b107b275b
branches:  trunk
changeset: 969702:e58b107b275b
user:      kim <kim%NetBSD.org@localhost>
date:      Fri Feb 28 10:41:48 2020 +0000

description:
Move NetBSD.org-specific entry above the match-all entry

The first matching entry that sets an option "wins." Therefore more
specific matches should be provided before the "Host *" entry that
matches everything. This way options set in the more specific entry will
not be accidentally made ineffective by the match-all entry.

diffstat:

 crypto/external/bsd/openssh/dist/ssh_config |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r 3f7c8e586a76 -r e58b107b275b crypto/external/bsd/openssh/dist/ssh_config
--- a/crypto/external/bsd/openssh/dist/ssh_config       Fri Feb 28 07:31:38 2020 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh_config       Fri Feb 28 10:41:48 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ssh_config,v 1.12 2019/04/20 17:16:40 christos Exp $
+#      $NetBSD: ssh_config,v 1.13 2020/02/28 10:41:48 kim Exp $
 #      $OpenBSD: ssh_config,v 1.34 2019/02/04 02:39:42 dtucker Exp $
 
 # This is the ssh client system-wide configuration file.  See
@@ -18,6 +18,10 @@
 # list of available options, their meanings and defaults, please see the
 # ssh_config(5) man page.
 
+# NetBSD.org DNS provides SSHFP records - use them when possible
+Host *.netbsd.org *.NetBSD.org
+    VerifyHostKeyDNS ask
+
 # Host *
 #   ForwardAgent no
 #   ForwardX11 no
@@ -45,7 +49,3 @@
 
 # If you use xorg from pkgsrc then uncomment the following line.
 #   XAuthLocation /usr/pkg/bin/xauth
-
-# NetBSD.org DNS provides SSHFP records - use them when possible
-Host *.netbsd.org *.NetBSD.org
-    VerifyHostKeyDNS ask