[openssh/f20] the .local domain example should be in ssh_config, not in sshd_config

[Jakub Jelen]

commit 4769e25cb101e314bb9f81b9672b3b989bc66907
Author: Jakub Jelen <jjelen at redhat.com>
Date:   Wed Mar 11 11:43:08 2015 +0100

    the .local domain example should be in ssh_config, not in sshd_config

 openssh-5.8p1-localdomain.patch | 19 ++++++++-----------
 openssh-6.3p1-redhat.patch      |  6 +++---
 2 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/openssh-5.8p1-localdomain.patch b/openssh-5.8p1-localdomain.patch
index 2f21658..2bff253 100644
--- a/openssh-5.8p1-localdomain.patch
+++ b/openssh-5.8p1-localdomain.patch
@@ -1,14 +1,11 @@
-diff -up openssh-5.8p1/sshd_config.localdomain openssh-5.8p1/sshd_config
---- openssh-5.8p1/sshd_config.localdomain	2011-04-22 11:37:49.273648812 +0200
-+++ openssh-5.8p1/sshd_config	2011-04-22 11:39:31.758648401 +0200
-@@ -130,6 +130,10 @@ X11Forwarding yes
- # override default of no subsystems
- Subsystem	sftp	/usr/libexec/sftp-server
- 
+diff --git a/ssh_config b/ssh_config
+--- a/ssh_config
++++ b/ssh_config
+@@ -48,3 +48,7 @@
+ #   VisualHostKey no
+ #   ProxyCommand ssh -q -W %h:%p gateway.example.com
+ #   RekeyLimit 1G 1h
++#
 +# Uncomment this if you want to use .local domain
 +#Host *.local
 +#	CheckHostIP no
-+
- # Example of overriding settings on a per-user basis
- #Match User anoncvs
- #	X11Forwarding no
diff --git a/openssh-6.3p1-redhat.patch b/openssh-6.3p1-redhat.patch
index 98df47d..80a7d8f 100644
--- a/openssh-6.3p1-redhat.patch
+++ b/openssh-6.3p1-redhat.patch
@@ -2,9 +2,9 @@ diff -up openssh-6.3p1/ssh_config.redhat openssh-6.3p1/ssh_config
 --- openssh-6.3p1/ssh_config.redhat	2013-10-11 14:51:18.345876648 +0200
 +++ openssh-6.3p1/ssh_config	2013-10-11 15:13:05.429829266 +0200
 @@ -46,3 +46,14 @@
- #   VisualHostKey no
- #   ProxyCommand ssh -q -W %h:%p gateway.example.com
- #   RekeyLimit 1G 1h
+ # Uncomment this if you want to use .local domain
+ #Host *.local
+ #	CheckHostIP no
 +Host *
 +	GSSAPIAuthentication yes
 +# If this option is set to yes then remote X11 clients will have full access