Add GSSAPIStoreCredentialsOnRekey to 'sshd -T' configuration dump.

3 files changed, 6 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
     debian/rules for the benefit of those checking out the package from
     revision control.
   * All patches are now maintained separately and tagged according to DEP-3.
+  * Add GSSAPIStoreCredentialsOnRekey to 'sshd -T' configuration dump.
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 27 Feb 2010 01:07:15 +0000
 
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 @@
 Description: GSSAPI configuration dump fixes
- Add GSSAPIKeyExchange and GSSAPIStrictAcceptorCheck to sshd -T
- configuration dump.
+ Add GSSAPIKeyExchange, GSSAPIStrictAcceptorCheck, and
+ GSSAPIStoreCredentialsOnRekey to sshd -T configuration dump.
 Author: Colin Watson <cjwatson@debian.org>
 Last-Updated: 2010-02-27
 
@@ -8,13 +8,14 @@ Index: b/servconf.c
 ===================================================================
 --- a/servconf.c
 +++ b/servconf.c
-@@ -1624,7 +1624,9 @@
+@@ -1624,7 +1624,10 @@
  #endif
  #ifdef GSSAPI
         dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
 +       dump_cfg_fmtint(sGssKeyEx, o->gss_keyex);
         dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
 +       dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
++       dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey);
  #endif
  #ifdef JPAKE
         dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication,
diff --git a/servconf.c b/servconf.c
index da8c3d0a5..55b56e59e 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1644,6 +1644,7 @@ dump_config(ServerOptions *o)
         dump_cfg_fmtint(sGssKeyEx, o->gss_keyex);
         dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
         dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
+        dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey);
 #endif
 #ifdef JPAKE
         dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication,