tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Add warning for UsePAM when built without PAM support

This commit is contained in:
Damien Miller 2003-05-16 11:42:35 +10:00
parent b78d5eb6c5
commit 6ac2c48a19
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -14,6 +14,7 @@
[readconf.c readconf.h ssh_config ssh_config.5 sshconnect.c] [readconf.c readconf.h ssh_config ssh_config.5 sshconnect.c]
add a ConnectTimeout option to ssh, based on patch from add a ConnectTimeout option to ssh, based on patch from
Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@ Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
- (djm) Add warning for UsePAM when built without PAM support
20030515 20030515
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -1545,4 +1546,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2727 2003/05/16 01:39:04 djm Exp $ $Id: ChangeLog,v 1.2728 2003/05/16 01:42:35 djm Exp $

8
servconf.c
View File

@ -131,11 +131,7 @@ fill_default_server_options(ServerOptions *options)
{ {
/* Portable-specific options */ /* Portable-specific options */
if (options->use_pam == -1) if (options->use_pam == -1)
#ifdef USE_PAM
options->use_pam = 1; options->use_pam = 1;
#else
options->use_pam = 0;
#endif
/* Standard Options */ /* Standard Options */
if (options->protocol == SSH_PROTO_UNKNOWN) if (options->protocol == SSH_PROTO_UNKNOWN)
@ -299,7 +295,11 @@ static struct {
ServerOpCodes opcode; ServerOpCodes opcode;
} keywords[] = { } keywords[] = {
/* Portable-specific options */ /* Portable-specific options */
#ifdef USE_PAM
{ "UsePAM", sUsePAM }, { "UsePAM", sUsePAM },
#else
{ "UsePAM", sUnsupported },
#endif
/* Standard Options */ /* Standard Options */
{ "port", sPort }, { "port", sPort },
{ "hostkey", sHostKeyFile }, { "hostkey", sHostKeyFile },