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

diff --git a/ChangeLog b/ChangeLog
index e5c17156b909253b40462beee17a488d22157de0..d6c662b70a8b4aeb4a34abbdd4f735b01ad86927 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
      [readconf.c readconf.h ssh_config ssh_config.5 sshconnect.c]
      add a ConnectTimeout option to ssh, based on patch from
      Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
+ - (djm) Add warning for UsePAM when built without PAM support
 
 20030515
  - (djm) OpenBSD CVS Sync

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