summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--servconf.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a36475d3..832b1609b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
14 [readconf.c readconf.h ssh_config ssh_config.5 sshconnect.c] 14 [readconf.c readconf.h ssh_config ssh_config.5 sshconnect.c]
15 add a ConnectTimeout option to ssh, based on patch from 15 add a ConnectTimeout option to ssh, based on patch from
16 Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@ 16 Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
17 - (djm) Add warning for UsePAM when built without PAM support
17 18
1820030515 1920030515
19 - (djm) OpenBSD CVS Sync 20 - (djm) OpenBSD CVS Sync
@@ -1545,4 +1546,4 @@
1545 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1546 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1546 ok provos@ 1547 ok provos@
1547 1548
1548$Id: ChangeLog,v 1.2727 2003/05/16 01:39:04 djm Exp $ 1549$Id: ChangeLog,v 1.2728 2003/05/16 01:42:35 djm Exp $
diff --git a/servconf.c b/servconf.c
index f37193a8f..a737f4b46 100644
--- a/servconf.c
+++ b/servconf.c
@@ -131,11 +131,7 @@ fill_default_server_options(ServerOptions *options)
131{ 131{
132 /* Portable-specific options */ 132 /* Portable-specific options */
133 if (options->use_pam == -1) 133 if (options->use_pam == -1)
134#ifdef USE_PAM
135 options->use_pam = 1; 134 options->use_pam = 1;
136#else
137 options->use_pam = 0;
138#endif
139 135
140 /* Standard Options */ 136 /* Standard Options */
141 if (options->protocol == SSH_PROTO_UNKNOWN) 137 if (options->protocol == SSH_PROTO_UNKNOWN)
@@ -299,7 +295,11 @@ static struct {
299 ServerOpCodes opcode; 295 ServerOpCodes opcode;
300} keywords[] = { 296} keywords[] = {
301 /* Portable-specific options */ 297 /* Portable-specific options */
298#ifdef USE_PAM
302 { "UsePAM", sUsePAM }, 299 { "UsePAM", sUsePAM },
300#else
301 { "UsePAM", sUnsupported },
302#endif
303 /* Standard Options */ 303 /* Standard Options */
304 { "port", sPort }, 304 { "port", sPort },
305 { "hostkey", sHostKeyFile }, 305 { "hostkey", sHostKeyFile },