- (djm) Die screaming if start_pam() is called when UsePAM=no

diff --git a/ChangeLog b/ChangeLog
index f08f8b4bb1e92f273b1bfb752329b6966a5944da..59f611a04275509fb3ad41f721bdae79fa1855fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,7 @@
  - (djm) Add new UsePAM configuration directive to allow runtime control
    over usage of PAM. This allows non-root use of sshd when built with
    --with-pam
+ - (djm) Die screaming if start_pam() is called when UsePAM=no
 
 20030512
  - (djm) Redhat spec: Don't install profile.d scripts when not 

diff --git a/auth-pam.c b/auth-pam.c
index 234e8f435f9f56ec283ded79d55d5a58770e100b..34326c242ee4ea0017f36e8a463d1db60e74b931 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -485,6 +485,9 @@ KbdintDevice mm_sshpam_device = {
 void
 start_pam(const char *user)
 {
+       if (!options.use_pam)
+               fatal("PAM: initialisation requested when UsePAM=no");
+
        if (sshpam_init(user) == -1)
                fatal("PAM: initialisation failed");
 }