- (djm) [servconf.c] Print UsePAM option in config test mode (when it

   has been compiled in); report from nix-corp AT esperi.org.uk
   ok dtucker@

diff --git a/ChangeLog b/ChangeLog
index a4e4b35868fea348e0078abfef0aeba25924137d..71a59315edb8d05ae65dc0f5e7f3c76f6940e36d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
      do not try to print options that have been compile-time disabled
      in config test mode (sshd -T); report from nix-corp AT esperi.org.uk
      ok dtucker@
+ - (djm) [servconf.c] Print UsePAM option in config test mode (when it
+   has been compiled in); report from nix-corp AT esperi.org.uk
+   ok dtucker@
 
 20080721
  - (djm) OpenBSD CVS Sync

diff --git a/servconf.c b/servconf.c
index 72746d34e7057badbcb58133b5839a6263d42e28..53e964deeef1723ab7bdb3e3d4fc675b0fea334e 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -1544,6 +1544,9 @@ dump_config(ServerOptions *o)
        }
 
        /* integer arguments */
+#ifdef USE_PAM
+       dump_cfg_int(sUsePAM, o->use_pam);
+#endif
        dump_cfg_int(sServerKeyBits, o->server_key_bits);
        dump_cfg_int(sLoginGraceTime, o->login_grace_time);
        dump_cfg_int(sKeyRegenerationTime, o->key_regeneration_time);