- (djm) Don't reinitialise PAM credentials before we have started PAM.

   Report from Pekka Savola <pekkas@netcore.fi>

diff --git a/ChangeLog b/ChangeLog
index 919eab81c4a1b5a6afaa1fc0d8454e1c6689968f..e822d7f2d75b6d9bee75f8abc3be36e6be542512 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,9 @@
  - (djm) Unbreak auth-passwd.c for PAM and SIA
  - (djm) Unbreak PAM auth for protocol 1. Report from Pekka Savola 
    <pekkas@netcore.fi>
-
+ - (djm) Don't reinitialise PAM credentials before we have started PAM.
+   Report from Pekka Savola <pekkas@netcore.fi>
+   
 20020506
  - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue
  

diff --git a/auth-pam.c b/auth-pam.c
index e8a9b77bc97a98ef6d62331c0519a4795cfc9b22..4b4c2f9d795372a3ebd1de46cdcfe58d22f7f754 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -299,6 +299,9 @@ void do_pam_setcred(int init)
 {
        int pam_retval;
 
+       if (__pamh == NULL)
+               return;
+
        do_pam_set_conv(&conv);
 
        debug("PAM establishing creds");