diff options
Diffstat (limited to 'debian/patches/debian-config.patch')
-rw-r--r-- | debian/patches/debian-config.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index a3f595752..ebf5d23bc 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4847e512c0b94c615b838904a5f139a761bee284 Mon Sep 17 00:00:00 2001 | 1 | From e8e09061f8168f6f105f56fca10b6cd61b9f587a 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 |
@@ -39,10 +39,10 @@ Patch-Name: debian-config.patch | |||
39 | 6 files changed, 77 insertions(+), 9 deletions(-) | 39 | 6 files changed, 77 insertions(+), 9 deletions(-) |
40 | 40 | ||
41 | diff --git a/readconf.c b/readconf.c | 41 | diff --git a/readconf.c b/readconf.c |
42 | index be3d5873..41f36aa8 100644 | 42 | index 50349e23..efcf2d62 100644 |
43 | --- a/readconf.c | 43 | --- a/readconf.c |
44 | +++ b/readconf.c | 44 | +++ b/readconf.c |
45 | @@ -1940,7 +1940,7 @@ fill_default_options(Options * options) | 45 | @@ -1916,7 +1916,7 @@ fill_default_options(Options * options) |
46 | if (options->forward_x11 == -1) | 46 | if (options->forward_x11 == -1) |
47 | options->forward_x11 = 0; | 47 | options->forward_x11 = 0; |
48 | if (options->forward_x11_trusted == -1) | 48 | if (options->forward_x11_trusted == -1) |
@@ -52,10 +52,10 @@ index be3d5873..41f36aa8 100644 | |||
52 | options->forward_x11_timeout = 1200; | 52 | options->forward_x11_timeout = 1200; |
53 | /* | 53 | /* |
54 | diff --git a/ssh.1 b/ssh.1 | 54 | diff --git a/ssh.1 b/ssh.1 |
55 | index 711fe608..f1b01c56 100644 | 55 | index f8fc26d2..8a03db95 100644 |
56 | --- a/ssh.1 | 56 | --- a/ssh.1 |
57 | +++ b/ssh.1 | 57 | +++ b/ssh.1 |
58 | @@ -764,6 +764,16 @@ directive in | 58 | @@ -768,6 +768,16 @@ directive in |
59 | .Xr ssh_config 5 | 59 | .Xr ssh_config 5 |
60 | for more information. | 60 | for more information. |
61 | .Pp | 61 | .Pp |
@@ -72,7 +72,7 @@ index 711fe608..f1b01c56 100644 | |||
72 | .It Fl x | 72 | .It Fl x |
73 | Disables X11 forwarding. | 73 | Disables X11 forwarding. |
74 | .Pp | 74 | .Pp |
75 | @@ -772,6 +782,17 @@ Enables trusted X11 forwarding. | 75 | @@ -776,6 +786,17 @@ Enables trusted X11 forwarding. |
76 | Trusted X11 forwardings are not subjected to the X11 SECURITY extension | 76 | Trusted X11 forwardings are not subjected to the X11 SECURITY extension |
77 | controls. | 77 | controls. |
78 | .Pp | 78 | .Pp |
@@ -114,7 +114,7 @@ index bcb9f153..1b676fb2 100644 | |||
114 | + HashKnownHosts yes | 114 | + HashKnownHosts yes |
115 | + GSSAPIAuthentication yes | 115 | + GSSAPIAuthentication yes |
116 | diff --git a/ssh_config.5 b/ssh_config.5 | 116 | diff --git a/ssh_config.5 b/ssh_config.5 |
117 | index 1edfe761..2da7029a 100644 | 117 | index ca052884..ed6e5d02 100644 |
118 | --- a/ssh_config.5 | 118 | --- a/ssh_config.5 |
119 | +++ b/ssh_config.5 | 119 | +++ b/ssh_config.5 |
120 | @@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more | 120 | @@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more |
@@ -140,7 +140,7 @@ index 1edfe761..2da7029a 100644 | |||
140 | The file contains keyword-argument pairs, one per line. | 140 | The file contains keyword-argument pairs, one per line. |
141 | Lines starting with | 141 | Lines starting with |
142 | .Ql # | 142 | .Ql # |
143 | @@ -683,11 +699,12 @@ elapsed. | 143 | @@ -690,11 +706,12 @@ elapsed. |
144 | .It Cm ForwardX11Trusted | 144 | .It Cm ForwardX11Trusted |
145 | If this option is set to | 145 | If this option is set to |
146 | .Cm yes , | 146 | .Cm yes , |
@@ -155,10 +155,10 @@ index 1edfe761..2da7029a 100644 | |||
155 | from stealing or tampering with data belonging to trusted X11 | 155 | from stealing or tampering with data belonging to trusted X11 |
156 | clients. | 156 | clients. |
157 | diff --git a/sshd_config b/sshd_config | 157 | diff --git a/sshd_config b/sshd_config |
158 | index c01dd656..f68edf36 100644 | 158 | index 86263d71..de9cc9fe 100644 |
159 | --- a/sshd_config | 159 | --- a/sshd_config |
160 | +++ b/sshd_config | 160 | +++ b/sshd_config |
161 | @@ -58,8 +58,9 @@ AuthorizedKeysFile .ssh/authorized_keys | 161 | @@ -57,8 +57,9 @@ AuthorizedKeysFile .ssh/authorized_keys |
162 | #PasswordAuthentication yes | 162 | #PasswordAuthentication yes |
163 | #PermitEmptyPasswords no | 163 | #PermitEmptyPasswords no |
164 | 164 | ||
@@ -170,7 +170,7 @@ index c01dd656..f68edf36 100644 | |||
170 | 170 | ||
171 | # Kerberos options | 171 | # Kerberos options |
172 | #KerberosAuthentication no | 172 | #KerberosAuthentication no |
173 | @@ -82,16 +83,16 @@ AuthorizedKeysFile .ssh/authorized_keys | 173 | @@ -81,16 +82,16 @@ AuthorizedKeysFile .ssh/authorized_keys |
174 | # If you just want the PAM account and session checks to run without | 174 | # If you just want the PAM account and session checks to run without |
175 | # PAM authentication, then enable this but set PasswordAuthentication | 175 | # PAM authentication, then enable this but set PasswordAuthentication |
176 | # and ChallengeResponseAuthentication to 'no'. | 176 | # and ChallengeResponseAuthentication to 'no'. |
@@ -190,7 +190,7 @@ index c01dd656..f68edf36 100644 | |||
190 | #PrintLastLog yes | 190 | #PrintLastLog yes |
191 | #TCPKeepAlive yes | 191 | #TCPKeepAlive yes |
192 | #UseLogin no | 192 | #UseLogin no |
193 | @@ -109,8 +110,11 @@ AuthorizedKeysFile .ssh/authorized_keys | 193 | @@ -108,8 +109,11 @@ AuthorizedKeysFile .ssh/authorized_keys |
194 | # no default banner path | 194 | # no default banner path |
195 | #Banner none | 195 | #Banner none |
196 | 196 | ||
@@ -204,10 +204,10 @@ index c01dd656..f68edf36 100644 | |||
204 | # Example of overriding settings on a per-user basis | 204 | # Example of overriding settings on a per-user basis |
205 | #Match User anoncvs | 205 | #Match User anoncvs |
206 | diff --git a/sshd_config.5 b/sshd_config.5 | 206 | diff --git a/sshd_config.5 b/sshd_config.5 |
207 | index 79676a95..16be4f62 100644 | 207 | index 44b91846..4c7ee425 100644 |
208 | --- a/sshd_config.5 | 208 | --- a/sshd_config.5 |
209 | +++ b/sshd_config.5 | 209 | +++ b/sshd_config.5 |
210 | @@ -55,6 +55,28 @@ Arguments may optionally be enclosed in double quotes | 210 | @@ -56,6 +56,28 @@ Arguments may optionally be enclosed in double quotes |
211 | .Pq \&" | 211 | .Pq \&" |
212 | in order to represent arguments containing spaces. | 212 | in order to represent arguments containing spaces. |
213 | .Pp | 213 | .Pp |