From 212f0b08790c415648db250797b1b060b62a015d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 23 Jul 2008 17:42:29 +1000 Subject: [PATCH] - (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@ --- ChangeLog | 5 ++++- servconf.c | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 85af46f84..99b450ac2 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 @@ -4718,4 +4721,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5096 2008/07/23 07:40:04 djm Exp $ +$Id: ChangeLog,v 1.5097 2008/07/23 07:42:29 djm Exp $ diff --git a/servconf.c b/servconf.c index 72746d34e..53e964dee 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);