diff options
Diffstat (limited to 'debian/patches/debian-config.patch')
-rw-r--r-- | debian/patches/debian-config.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index d65ed45fa..a3f595752 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cf60afd3438c444e20b114fbd799168002c74aae Mon Sep 17 00:00:00 2001 | 1 | From 4847e512c0b94c615b838904a5f139a761bee284 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 |
@@ -26,7 +26,7 @@ Document all of this. | |||
26 | 26 | ||
27 | Author: Russ Allbery <rra@debian.org> | 27 | Author: Russ Allbery <rra@debian.org> |
28 | Forwarded: not-needed | 28 | Forwarded: not-needed |
29 | Last-Update: 2016-12-26 | 29 | Last-Update: 2017-10-04 |
30 | 30 | ||
31 | Patch-Name: debian-config.patch | 31 | Patch-Name: debian-config.patch |
32 | --- | 32 | --- |
@@ -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 70fac682..4d92d174 100644 | 42 | index be3d5873..41f36aa8 100644 |
43 | --- a/readconf.c | 43 | --- a/readconf.c |
44 | +++ b/readconf.c | 44 | +++ b/readconf.c |
45 | @@ -1950,7 +1950,7 @@ fill_default_options(Options * options) | 45 | @@ -1940,7 +1940,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 70fac682..4d92d174 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 22e56a7b..6aa57c46 100644 | 55 | index 711fe608..f1b01c56 100644 |
56 | --- a/ssh.1 | 56 | --- a/ssh.1 |
57 | +++ b/ssh.1 | 57 | +++ b/ssh.1 |
58 | @@ -785,6 +785,16 @@ directive in | 58 | @@ -764,6 +764,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 22e56a7b..6aa57c46 100644 | |||
72 | .It Fl x | 72 | .It Fl x |
73 | Disables X11 forwarding. | 73 | Disables X11 forwarding. |
74 | .Pp | 74 | .Pp |
75 | @@ -793,6 +803,17 @@ Enables trusted X11 forwarding. | 75 | @@ -772,6 +782,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 |
@@ -91,7 +91,7 @@ index 22e56a7b..6aa57c46 100644 | |||
91 | Send log information using the | 91 | Send log information using the |
92 | .Xr syslog 3 | 92 | .Xr syslog 3 |
93 | diff --git a/ssh_config b/ssh_config | 93 | diff --git a/ssh_config b/ssh_config |
94 | index 4e879cd2..093c8366 100644 | 94 | index bcb9f153..1b676fb2 100644 |
95 | --- a/ssh_config | 95 | --- a/ssh_config |
96 | +++ b/ssh_config | 96 | +++ b/ssh_config |
97 | @@ -17,9 +17,10 @@ | 97 | @@ -17,9 +17,10 @@ |
@@ -103,10 +103,10 @@ index 4e879cd2..093c8366 100644 | |||
103 | # ForwardAgent no | 103 | # ForwardAgent no |
104 | # ForwardX11 no | 104 | # ForwardX11 no |
105 | +# ForwardX11Trusted yes | 105 | +# ForwardX11Trusted yes |
106 | # RhostsRSAAuthentication no | ||
107 | # RSAAuthentication yes | ||
108 | # PasswordAuthentication yes | 106 | # PasswordAuthentication yes |
109 | @@ -50,3 +51,6 @@ | 107 | # HostbasedAuthentication no |
108 | # GSSAPIAuthentication no | ||
109 | @@ -46,3 +47,6 @@ | ||
110 | # VisualHostKey no | 110 | # VisualHostKey no |
111 | # ProxyCommand ssh -q -W %h:%p gateway.example.com | 111 | # ProxyCommand ssh -q -W %h:%p gateway.example.com |
112 | # RekeyLimit 1G 1h | 112 | # RekeyLimit 1G 1h |
@@ -114,10 +114,10 @@ index 4e879cd2..093c8366 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 093ea8a7..fc13fa51 100644 | 117 | index 1edfe761..2da7029a 100644 |
118 | --- a/ssh_config.5 | 118 | --- a/ssh_config.5 |
119 | +++ b/ssh_config.5 | 119 | +++ b/ssh_config.5 |
120 | @@ -74,6 +74,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 |
121 | host-specific declarations should be given near the beginning of the | 121 | host-specific declarations should be given near the beginning of the |
122 | file, and general defaults at the end. | 122 | file, and general defaults at the end. |
123 | .Pp | 123 | .Pp |
@@ -140,7 +140,7 @@ index 093ea8a7..fc13fa51 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 | @@ -715,11 +731,12 @@ elapsed. | 143 | @@ -683,11 +699,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 , |
@@ -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 603c2ba7..cc5d9fb0 100644 | 207 | index 79676a95..16be4f62 100644 |
208 | --- a/sshd_config.5 | 208 | --- a/sshd_config.5 |
209 | +++ b/sshd_config.5 | 209 | +++ b/sshd_config.5 |
210 | @@ -57,6 +57,28 @@ Arguments may optionally be enclosed in double quotes | 210 | @@ -55,6 +55,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 |