diff options
Diffstat (limited to 'debian/patches/keepalive-extensions.patch')
-rw-r--r-- | debian/patches/keepalive-extensions.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch index 1bfc9c798..55d07e0d6 100644 --- a/debian/patches/keepalive-extensions.patch +++ b/debian/patches/keepalive-extensions.patch | |||
@@ -26,7 +26,7 @@ Index: b/readconf.c | |||
26 | oDeprecated, oUnsupported | 26 | oDeprecated, oUnsupported |
27 | } OpCodes; | 27 | } OpCodes; |
28 | 28 | ||
29 | @@ -246,6 +247,8 @@ | 29 | @@ -248,6 +249,8 @@ |
30 | #else | 30 | #else |
31 | { "zeroknowledgepasswordauthentication", oUnsupported }, | 31 | { "zeroknowledgepasswordauthentication", oUnsupported }, |
32 | #endif | 32 | #endif |
@@ -35,7 +35,7 @@ Index: b/readconf.c | |||
35 | 35 | ||
36 | { NULL, oBadOption } | 36 | { NULL, oBadOption } |
37 | }; | 37 | }; |
38 | @@ -845,6 +848,8 @@ | 38 | @@ -847,6 +850,8 @@ |
39 | goto parse_flag; | 39 | goto parse_flag; |
40 | 40 | ||
41 | case oServerAliveInterval: | 41 | case oServerAliveInterval: |
@@ -44,7 +44,7 @@ Index: b/readconf.c | |||
44 | intptr = &options->server_alive_interval; | 44 | intptr = &options->server_alive_interval; |
45 | goto parse_time; | 45 | goto parse_time; |
46 | 46 | ||
47 | @@ -1233,8 +1238,13 @@ | 47 | @@ -1235,8 +1240,13 @@ |
48 | options->rekey_limit = 0; | 48 | options->rekey_limit = 0; |
49 | if (options->verify_host_key_dns == -1) | 49 | if (options->verify_host_key_dns == -1) |
50 | options->verify_host_key_dns = 0; | 50 | options->verify_host_key_dns = 0; |
@@ -78,7 +78,7 @@ Index: b/ssh_config.5 | |||
78 | The argument must be | 78 | The argument must be |
79 | .Dq yes | 79 | .Dq yes |
80 | or | 80 | or |
81 | @@ -946,8 +950,15 @@ | 81 | @@ -967,8 +971,15 @@ |
82 | will send a message through the encrypted | 82 | will send a message through the encrypted |
83 | channel to request a response from the server. | 83 | channel to request a response from the server. |
84 | The default | 84 | The default |
@@ -92,10 +92,10 @@ Index: b/ssh_config.5 | |||
92 | +and | 92 | +and |
93 | +.Cm SetupTimeOut | 93 | +.Cm SetupTimeOut |
94 | +are Debian-specific compatibility aliases for this option. | 94 | +are Debian-specific compatibility aliases for this option. |
95 | .It Cm SmartcardDevice | 95 | .It Cm StrictHostKeyChecking |
96 | Specifies which smartcard device to use. | 96 | If this flag is set to |
97 | The argument to this keyword is the device | 97 | .Dq yes , |
98 | @@ -993,6 +1004,12 @@ | 98 | @@ -1007,6 +1018,12 @@ |
99 | other side. | 99 | other side. |
100 | If they are sent, death of the connection or crash of one | 100 | If they are sent, death of the connection or crash of one |
101 | of the machines will be properly noticed. | 101 | of the machines will be properly noticed. |
@@ -112,13 +112,13 @@ Index: b/sshd_config.5 | |||
112 | =================================================================== | 112 | =================================================================== |
113 | --- a/sshd_config.5 | 113 | --- a/sshd_config.5 |
114 | +++ b/sshd_config.5 | 114 | +++ b/sshd_config.5 |
115 | @@ -919,6 +919,9 @@ | 115 | @@ -936,6 +936,9 @@ |
116 | .Pp | 116 | .Pp |
117 | To disable TCP keepalive messages, the value should be set to | 117 | To disable TCP keepalive messages, the value should be set to |
118 | .Dq no . | 118 | .Dq no . |
119 | +.Pp | 119 | +.Pp |
120 | +This option was formerly called | 120 | +This option was formerly called |
121 | +.Cm KeepAlive . | 121 | +.Cm KeepAlive . |
122 | .It Cm UseDNS | 122 | .It Cm TrustedUserCAKeys |
123 | Specifies whether | 123 | Specifies a file containing public keys of certificate authorities that are |
124 | .Xr sshd 8 | 124 | trusted to sign user certificates for authentication. |