diff options
author | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:36:13 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:39:41 +0000 |
commit | 2028ecabc263b3e43903b8d170f4bbd07fe408e9 (patch) | |
tree | 565242aad1c1d73b6d99f9bf2c62278fca5bdd8c /debian/patches/debian-config.patch | |
parent | 18a9bd1867ee6fb9d913515773b322a279759b5d (diff) | |
parent | 733c4de05612fe398ac3dc7d31d318d7012fda05 (diff) |
New upstream release (7.1p1).
Diffstat (limited to 'debian/patches/debian-config.patch')
-rw-r--r-- | debian/patches/debian-config.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index aae4e7d34..ddc9de44a 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6d0faf6dc76ac8cc73d6f8e478db7c97f7013a2d Mon Sep 17 00:00:00 2001 | 1 | From 733c4de05612fe398ac3dc7d31d318d7012fda05 Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 |
4 | Subject: Various Debian-specific configuration changes | 4 | Subject: Various Debian-specific configuration changes |
@@ -107,7 +107,7 @@ index 228e5ab..c9386aa 100644 | |||
107 | + GSSAPIAuthentication yes | 107 | + GSSAPIAuthentication yes |
108 | + GSSAPIDelegateCredentials no | 108 | + GSSAPIDelegateCredentials no |
109 | diff --git a/ssh_config.5 b/ssh_config.5 | 109 | diff --git a/ssh_config.5 b/ssh_config.5 |
110 | index 5bc04b0..aaa435a 100644 | 110 | index 680ca17..981197d 100644 |
111 | --- a/ssh_config.5 | 111 | --- a/ssh_config.5 |
112 | +++ b/ssh_config.5 | 112 | +++ b/ssh_config.5 |
113 | @@ -74,6 +74,22 @@ Since the first obtained value for each parameter is used, more | 113 | @@ -74,6 +74,22 @@ Since the first obtained value for each parameter is used, more |
@@ -144,7 +144,7 @@ index 5bc04b0..aaa435a 100644 | |||
144 | See the X11 SECURITY extension specification for full details on | 144 | See the X11 SECURITY extension specification for full details on |
145 | the restrictions imposed on untrusted clients. | 145 | the restrictions imposed on untrusted clients. |
146 | diff --git a/sshd_config.5 b/sshd_config.5 | 146 | diff --git a/sshd_config.5 b/sshd_config.5 |
147 | index 7e40a27..92c23bc 100644 | 147 | index 0828592..0be7250 100644 |
148 | --- a/sshd_config.5 | 148 | --- a/sshd_config.5 |
149 | +++ b/sshd_config.5 | 149 | +++ b/sshd_config.5 |
150 | @@ -57,6 +57,31 @@ Arguments may optionally be enclosed in double quotes | 150 | @@ -57,6 +57,31 @@ Arguments may optionally be enclosed in double quotes |