Module Name: src
Committed By: kim
Date: Fri Feb 28 10:41:49 UTC 2020
Modified Files:
src/crypto/external/bsd/openssh/dist: ssh_config
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/ssh_config
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/ssh_config
diff -u src/crypto/external/bsd/openssh/dist/ssh_config:1.12 src/crypto/external/bsd/openssh/dist/ssh_config:1.13
--- src/crypto/external/bsd/openssh/dist/ssh_config:1.12 Sat Apr 20 17:16:40 2019
+++ src/crypto/external/bsd/openssh/dist/ssh_config Fri Feb 28 10:41:48 2020
@@ -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
