diff options
Diffstat (limited to 'debian/patches/debian-banner.patch')
-rw-r--r-- | debian/patches/debian-banner.patch | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch index 22b1e4c14..d96f2cc59 100644 --- a/debian/patches/debian-banner.patch +++ b/debian/patches/debian-banner.patch | |||
@@ -4,13 +4,13 @@ Description: Add DebianBanner server configuration option | |||
4 | Author: Kees Cook <kees@debian.org> | 4 | Author: Kees Cook <kees@debian.org> |
5 | Bug-Debian: http://bugs.debian.org/562048 | 5 | Bug-Debian: http://bugs.debian.org/562048 |
6 | Forwarded: not-needed | 6 | Forwarded: not-needed |
7 | Last-Update: 2012-09-07 | 7 | Last-Update: 2013-05-07 |
8 | 8 | ||
9 | Index: b/servconf.c | 9 | Index: b/servconf.c |
10 | =================================================================== | 10 | =================================================================== |
11 | --- a/servconf.c | 11 | --- a/servconf.c |
12 | +++ b/servconf.c | 12 | +++ b/servconf.c |
13 | @@ -146,6 +146,7 @@ | 13 | @@ -150,6 +150,7 @@ |
14 | options->ip_qos_interactive = -1; | 14 | options->ip_qos_interactive = -1; |
15 | options->ip_qos_bulk = -1; | 15 | options->ip_qos_bulk = -1; |
16 | options->version_addendum = NULL; | 16 | options->version_addendum = NULL; |
@@ -18,7 +18,7 @@ Index: b/servconf.c | |||
18 | } | 18 | } |
19 | 19 | ||
20 | void | 20 | void |
21 | @@ -295,6 +296,8 @@ | 21 | @@ -299,6 +300,8 @@ |
22 | options->ip_qos_bulk = IPTOS_THROUGHPUT; | 22 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
23 | if (options->version_addendum == NULL) | 23 | if (options->version_addendum == NULL) |
24 | options->version_addendum = xstrdup(""); | 24 | options->version_addendum = xstrdup(""); |
@@ -27,23 +27,23 @@ Index: b/servconf.c | |||
27 | /* Turn privilege separation on by default */ | 27 | /* Turn privilege separation on by default */ |
28 | if (use_privsep == -1) | 28 | if (use_privsep == -1) |
29 | use_privsep = PRIVSEP_NOSANDBOX; | 29 | use_privsep = PRIVSEP_NOSANDBOX; |
30 | @@ -343,6 +346,7 @@ | 30 | @@ -349,6 +352,7 @@ |
31 | sZeroKnowledgePasswordAuthentication, sHostCertificate, | ||
32 | sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, | ||
33 | sKexAlgorithms, sIPQoS, sVersionAddendum, | 31 | sKexAlgorithms, sIPQoS, sVersionAddendum, |
32 | sAuthorizedKeysCommand, sAuthorizedKeysCommandUser, | ||
33 | sAuthenticationMethods, | ||
34 | + sDebianBanner, | 34 | + sDebianBanner, |
35 | sDeprecated, sUnsupported | 35 | sDeprecated, sUnsupported |
36 | } ServerOpCodes; | 36 | } ServerOpCodes; |
37 | 37 | ||
38 | @@ -479,6 +483,7 @@ | 38 | @@ -488,6 +492,7 @@ |
39 | { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, | 39 | { "authorizedkeyscommanduser", sAuthorizedKeysCommandUser, SSHCFG_ALL }, |
40 | { "ipqos", sIPQoS, SSHCFG_ALL }, | ||
41 | { "versionaddendum", sVersionAddendum, SSHCFG_GLOBAL }, | 40 | { "versionaddendum", sVersionAddendum, SSHCFG_GLOBAL }, |
41 | { "authenticationmethods", sAuthenticationMethods, 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 | @@ -1538,6 +1543,10 @@ | 46 | @@ -1593,6 +1598,10 @@ |
47 | } | 47 | } |
48 | return 0; | 48 | return 0; |
49 | 49 | ||
@@ -58,10 +58,11 @@ Index: b/servconf.h | |||
58 | =================================================================== | 58 | =================================================================== |
59 | --- a/servconf.h | 59 | --- a/servconf.h |
60 | +++ b/servconf.h | 60 | +++ b/servconf.h |
61 | @@ -172,6 +172,7 @@ | 61 | @@ -184,6 +184,8 @@ |
62 | char *authorized_principals_file; | ||
63 | 62 | ||
64 | char *version_addendum; /* Appended to SSH banner */ | 63 | u_int num_auth_methods; |
64 | char *auth_methods[MAX_AUTH_METHODS]; | ||
65 | + | ||
65 | + int debian_banner; | 66 | + int debian_banner; |
66 | } ServerOptions; | 67 | } ServerOptions; |
67 | 68 | ||
@@ -70,7 +71,7 @@ Index: b/sshd.c | |||
70 | =================================================================== | 71 | =================================================================== |
71 | --- a/sshd.c | 72 | --- a/sshd.c |
72 | +++ b/sshd.c | 73 | +++ b/sshd.c |
73 | @@ -425,7 +425,8 @@ | 74 | @@ -434,7 +434,8 @@ |
74 | } | 75 | } |
75 | 76 | ||
76 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", | 77 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", |
@@ -84,7 +85,7 @@ Index: b/sshd_config.5 | |||
84 | =================================================================== | 85 | =================================================================== |
85 | --- a/sshd_config.5 | 86 | --- a/sshd_config.5 |
86 | +++ b/sshd_config.5 | 87 | +++ b/sshd_config.5 |
87 | @@ -342,6 +342,11 @@ | 88 | @@ -397,6 +397,11 @@ |
88 | .Dq no . | 89 | .Dq no . |
89 | The default is | 90 | The default is |
90 | .Dq delayed . | 91 | .Dq delayed . |