- (djm) Make sure pam_retval is initialised on call to pam_end. Patch

   from Solar Designer <solar@openwall.com>

diff --git a/ChangeLog b/ChangeLog
index 796404b1bbc4f833e6f6dce6eedab05f698c23b3..c7b0342c5357a0ce39a19a889017c2194abe2702 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20010321
  - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve 
    VanDevender <stevev@darkwing.uoregon.edu>
+ - (djm) Make sure pam_retval is initialised on call to pam_end. Patch
+   from Solar Designer <solar@openwall.com>
 
 20010320
  - (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS).

diff --git a/auth-pam.c b/auth-pam.c
index bb580a3068ef41f0bd34e1286a346d58f6d6b506..b6f4dcd4df4b668f4117a18655030041a49e6746 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -172,7 +172,7 @@ static int do_pam_conversation(int num_msg, const struct pam_message **msg,
 /* Called at exit to cleanly shutdown PAM */
 void do_pam_cleanup_proc(void *context)
 {
-       int pam_retval;
+       int pam_retval = PAM_SUCCESS;
 
        if (__pamh && session_opened) {
                pam_retval = pam_close_session(__pamh, 0);