diff options
author | Damien Miller <djm@mindrot.org> | 2008-07-23 17:42:29 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-07-23 17:42:29 +1000 |
commit | 212f0b08790c415648db250797b1b060b62a015d (patch) | |
tree | 87b163e4a274131ef0f99ce17aff2d2f255d3b22 | |
parent | 6ef430dcc357f9e8fe02a057840538939b45602a (diff) |
- (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@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | servconf.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -5,6 +5,9 @@ | |||
5 | do not try to print options that have been compile-time disabled | 5 | do not try to print options that have been compile-time disabled |
6 | in config test mode (sshd -T); report from nix-corp AT esperi.org.uk | 6 | in config test mode (sshd -T); report from nix-corp AT esperi.org.uk |
7 | ok dtucker@ | 7 | ok dtucker@ |
8 | - (djm) [servconf.c] Print UsePAM option in config test mode (when it | ||
9 | has been compiled in); report from nix-corp AT esperi.org.uk | ||
10 | ok dtucker@ | ||
8 | 11 | ||
9 | 20080721 | 12 | 20080721 |
10 | - (djm) OpenBSD CVS Sync | 13 | - (djm) OpenBSD CVS Sync |
@@ -4718,4 +4721,4 @@ | |||
4718 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4721 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4719 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4722 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4720 | 4723 | ||
4721 | $Id: ChangeLog,v 1.5096 2008/07/23 07:40:04 djm Exp $ | 4724 | $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) | |||
1544 | } | 1544 | } |
1545 | 1545 | ||
1546 | /* integer arguments */ | 1546 | /* integer arguments */ |
1547 | #ifdef USE_PAM | ||
1548 | dump_cfg_int(sUsePAM, o->use_pam); | ||
1549 | #endif | ||
1547 | dump_cfg_int(sServerKeyBits, o->server_key_bits); | 1550 | dump_cfg_int(sServerKeyBits, o->server_key_bits); |
1548 | dump_cfg_int(sLoginGraceTime, o->login_grace_time); | 1551 | dump_cfg_int(sLoginGraceTime, o->login_grace_time); |
1549 | dump_cfg_int(sKeyRegenerationTime, o->key_regeneration_time); | 1552 | dump_cfg_int(sKeyRegenerationTime, o->key_regeneration_time); |