diff options
Diffstat (limited to 'debian/patches/debian-config.patch')
-rw-r--r-- | debian/patches/debian-config.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index 45a8364ca..d005bdc2e 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch | |||
@@ -18,13 +18,13 @@ Description: Various Debian-specific configuration changes | |||
18 | Author: Colin Watson <cjwatson@debian.org> | 18 | Author: Colin Watson <cjwatson@debian.org> |
19 | Author: Russ Allbery <rra@debian.org> | 19 | Author: Russ Allbery <rra@debian.org> |
20 | Forwarded: not-needed | 20 | Forwarded: not-needed |
21 | Last-Update: 2013-05-16 | 21 | Last-Update: 2013-09-14 |
22 | 22 | ||
23 | Index: b/readconf.c | 23 | Index: b/readconf.c |
24 | =================================================================== | 24 | =================================================================== |
25 | --- a/readconf.c | 25 | --- a/readconf.c |
26 | +++ b/readconf.c | 26 | +++ b/readconf.c |
27 | @@ -1288,7 +1288,7 @@ | 27 | @@ -1298,7 +1298,7 @@ |
28 | if (options->forward_x11 == -1) | 28 | if (options->forward_x11 == -1) |
29 | options->forward_x11 = 0; | 29 | options->forward_x11 = 0; |
30 | if (options->forward_x11_trusted == -1) | 30 | if (options->forward_x11_trusted == -1) |
@@ -49,10 +49,10 @@ Index: b/ssh_config | |||
49 | # RhostsRSAAuthentication no | 49 | # RhostsRSAAuthentication no |
50 | # RSAAuthentication yes | 50 | # RSAAuthentication yes |
51 | # PasswordAuthentication yes | 51 | # PasswordAuthentication yes |
52 | @@ -47,3 +48,7 @@ | 52 | @@ -48,3 +49,7 @@ |
53 | # PermitLocalCommand no | ||
54 | # VisualHostKey no | 53 | # VisualHostKey no |
55 | # ProxyCommand ssh -q -W %h:%p gateway.example.com | 54 | # ProxyCommand ssh -q -W %h:%p gateway.example.com |
55 | # RekeyLimit 1G 1h | ||
56 | + SendEnv LANG LC_* | 56 | + SendEnv LANG LC_* |
57 | + HashKnownHosts yes | 57 | + HashKnownHosts yes |
58 | + GSSAPIAuthentication yes | 58 | + GSSAPIAuthentication yes |
@@ -84,7 +84,7 @@ Index: b/ssh_config.5 | |||
84 | The configuration file has the following format: | 84 | The configuration file has the following format: |
85 | .Pp | 85 | .Pp |
86 | Empty lines and lines starting with | 86 | Empty lines and lines starting with |
87 | @@ -502,7 +518,8 @@ | 87 | @@ -501,7 +517,8 @@ |
88 | Remote clients will be refused access after this time. | 88 | Remote clients will be refused access after this time. |
89 | .Pp | 89 | .Pp |
90 | The default is | 90 | The default is |
@@ -98,7 +98,7 @@ Index: b/sshd_config | |||
98 | =================================================================== | 98 | =================================================================== |
99 | --- a/sshd_config | 99 | --- a/sshd_config |
100 | +++ b/sshd_config | 100 | +++ b/sshd_config |
101 | @@ -37,6 +37,7 @@ | 101 | @@ -40,6 +40,7 @@ |
102 | # Authentication: | 102 | # Authentication: |
103 | 103 | ||
104 | #LoginGraceTime 2m | 104 | #LoginGraceTime 2m |