From: djm <djm>
Date: Wed, 23 Jul 2008 07:42:29 +0000 (+0000)
Subject:  - (djm) [servconf.c] Print UsePAM option in config test mode (when it
X-Git-Tag: V_5_2_P1~112
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/cee47c9f412a3e965a130477ff5a9f07974c9d83

 - (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 a4e4b358..71a59315 100644
--- 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 72746d34..53e964de 100644
--- 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);