diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/patches/gssapi-dump.patch | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 5157f5f71..be95248af 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -5,6 +5,7 @@ openssh (1:5.3p1-3) UNRELEASED; urgency=low | |||
5 | debian/rules for the benefit of those checking out the package from | 5 | debian/rules for the benefit of those checking out the package from |
6 | revision control. | 6 | revision control. |
7 | * All patches are now maintained separately and tagged according to DEP-3. | 7 | * All patches are now maintained separately and tagged according to DEP-3. |
8 | * Add GSSAPIStoreCredentialsOnRekey to 'sshd -T' configuration dump. | ||
8 | 9 | ||
9 | -- Colin Watson <cjwatson@debian.org> Sat, 27 Feb 2010 01:07:15 +0000 | 10 | -- Colin Watson <cjwatson@debian.org> Sat, 27 Feb 2010 01:07:15 +0000 |
10 | 11 | ||
diff --git a/debian/patches/gssapi-dump.patch b/debian/patches/gssapi-dump.patch index 7292ac08d..79ee7c4b4 100644 --- a/debian/patches/gssapi-dump.patch +++ b/debian/patches/gssapi-dump.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | Description: GSSAPI configuration dump fixes | 1 | Description: GSSAPI configuration dump fixes |
2 | Add GSSAPIKeyExchange and GSSAPIStrictAcceptorCheck to sshd -T | 2 | Add GSSAPIKeyExchange, GSSAPIStrictAcceptorCheck, and |
3 | configuration dump. | 3 | GSSAPIStoreCredentialsOnRekey to sshd -T configuration dump. |
4 | Author: Colin Watson <cjwatson@debian.org> | 4 | Author: Colin Watson <cjwatson@debian.org> |
5 | Last-Updated: 2010-02-27 | 5 | Last-Updated: 2010-02-27 |
6 | 6 | ||
@@ -8,13 +8,14 @@ Index: b/servconf.c | |||
8 | =================================================================== | 8 | =================================================================== |
9 | --- a/servconf.c | 9 | --- a/servconf.c |
10 | +++ b/servconf.c | 10 | +++ b/servconf.c |
11 | @@ -1624,7 +1624,9 @@ | 11 | @@ -1624,7 +1624,10 @@ |
12 | #endif | 12 | #endif |
13 | #ifdef GSSAPI | 13 | #ifdef GSSAPI |
14 | dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); | 14 | dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); |
15 | + dump_cfg_fmtint(sGssKeyEx, o->gss_keyex); | 15 | + dump_cfg_fmtint(sGssKeyEx, o->gss_keyex); |
16 | dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); | 16 | dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); |
17 | + dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); | 17 | + dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); |
18 | + dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey); | ||
18 | #endif | 19 | #endif |
19 | #ifdef JPAKE | 20 | #ifdef JPAKE |
20 | dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication, | 21 | dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication, |