diff options
Diffstat (limited to 'debian/patches/debian-banner.patch')
-rw-r--r-- | debian/patches/debian-banner.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch index b0761420e..32251397d 100644 --- a/debian/patches/debian-banner.patch +++ b/debian/patches/debian-banner.patch | |||
@@ -10,42 +10,42 @@ Index: b/servconf.c | |||
10 | =================================================================== | 10 | =================================================================== |
11 | --- a/servconf.c | 11 | --- a/servconf.c |
12 | +++ b/servconf.c | 12 | +++ b/servconf.c |
13 | @@ -136,6 +136,7 @@ | 13 | @@ -143,6 +143,7 @@ |
14 | options->revoked_keys_file = NULL; | ||
15 | options->trusted_user_ca_keys = NULL; | ||
16 | options->authorized_principals_file = NULL; | 14 | options->authorized_principals_file = NULL; |
15 | options->ip_qos_interactive = -1; | ||
16 | options->ip_qos_bulk = -1; | ||
17 | + options->debian_banner = -1; | 17 | + options->debian_banner = -1; |
18 | } | 18 | } |
19 | 19 | ||
20 | void | 20 | void |
21 | @@ -278,6 +279,8 @@ | 21 | @@ -293,6 +294,8 @@ |
22 | options->permit_tun = SSH_TUNMODE_NO; | 22 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
23 | if (options->zero_knowledge_password_authentication == -1) | 23 | if (options->ip_qos_bulk == -1) |
24 | options->zero_knowledge_password_authentication = 0; | 24 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
25 | + if (options->debian_banner == -1) | 25 | + if (options->debian_banner == -1) |
26 | + options->debian_banner = 1; | 26 | + options->debian_banner = 1; |
27 | 27 | ||
28 | /* Turn privilege separation on by default */ | 28 | /* Turn privilege separation on by default */ |
29 | if (use_privsep == -1) | 29 | if (use_privsep == -1) |
30 | @@ -326,6 +329,7 @@ | 30 | @@ -342,6 +345,7 @@ |
31 | sUsePrivilegeSeparation, sAllowAgentForwarding, | ||
32 | sZeroKnowledgePasswordAuthentication, sHostCertificate, | 31 | sZeroKnowledgePasswordAuthentication, sHostCertificate, |
33 | sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, | 32 | sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, |
33 | sKexAlgorithms, sIPQoS, | ||
34 | + sDebianBanner, | 34 | + sDebianBanner, |
35 | sDeprecated, sUnsupported | 35 | sDeprecated, sUnsupported |
36 | } ServerOpCodes; | 36 | } ServerOpCodes; |
37 | 37 | ||
38 | @@ -459,6 +463,7 @@ | 38 | @@ -477,6 +481,7 @@ |
39 | { "revokedkeys", sRevokedKeys, SSHCFG_ALL }, | ||
40 | { "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL }, | ||
41 | { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, | 39 | { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, |
40 | { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, | ||
41 | { "ipqos", sIPQoS, SSHCFG_ALL }, | ||
42 | + { "debianbanner", sDebianBanner, SSHCFG_GLOBAL }, | 42 | + { "debianbanner", sDebianBanner, SSHCFG_GLOBAL }, |
43 | { NULL, sBadOption, 0 } | 43 | { NULL, sBadOption, 0 } |
44 | }; | 44 | }; |
45 | 45 | ||
46 | @@ -1392,6 +1397,10 @@ | 46 | @@ -1439,6 +1444,10 @@ |
47 | charptr = &options->revoked_keys_file; | 47 | } |
48 | goto parse_filename; | 48 | break; |
49 | 49 | ||
50 | + case sDebianBanner: | 50 | + case sDebianBanner: |
51 | + intptr = &options->debian_banner; | 51 | + intptr = &options->debian_banner; |
@@ -58,7 +58,7 @@ Index: b/servconf.h | |||
58 | =================================================================== | 58 | =================================================================== |
59 | --- a/servconf.h | 59 | --- a/servconf.h |
60 | +++ b/servconf.h | 60 | +++ b/servconf.h |
61 | @@ -157,6 +157,8 @@ | 61 | @@ -160,6 +160,8 @@ |
62 | 62 | ||
63 | int num_permitted_opens; | 63 | int num_permitted_opens; |
64 | 64 | ||
@@ -85,7 +85,7 @@ Index: b/sshd_config.5 | |||
85 | =================================================================== | 85 | =================================================================== |
86 | --- a/sshd_config.5 | 86 | --- a/sshd_config.5 |
87 | +++ b/sshd_config.5 | 87 | +++ b/sshd_config.5 |
88 | @@ -340,6 +340,11 @@ | 88 | @@ -339,6 +339,11 @@ |
89 | .Dq no . | 89 | .Dq no . |
90 | The default is | 90 | The default is |
91 | .Dq delayed . | 91 | .Dq delayed . |