← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssh/lucid

« back to all changes in this revision

Viewing changes to auth-pam.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2010-01-26 13:07:40 UTC
  • mfrom: (1.13.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100126130740-d7r70jqrqlbvz3r0
Tags: 1:5.3p1-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Add support for registering ConsoleKit sessions on login.
  - Drop openssh-blacklist and openssh-blacklist-extra to Suggests; they
    take up a lot of CD space, and I suspect that rolling them out in
    security updates has covered most affected systems now.
  - Convert to Upstart.  The init script is still here for the benefit of
    people running sshd in chroots.

Show diffs side-by-side

added added

removed removed

Lines of Context:
auth-pam.c
602
602
                return;
603
603
        debug("PAM: cleanup");
604
604
        pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
 
605
        if (sshpam_session_open) {
 
606
                debug("PAM: closing session");
 
607
                pam_close_session(sshpam_handle, PAM_SILENT);
 
608
                sshpam_session_open = 0;
 
609
        }
605
610
        if (sshpam_cred_established) {
606
611
                debug("PAM: deleting credentials");
607
612
                pam_setcred(sshpam_handle, PAM_DELETE_CRED);
608
613
                sshpam_cred_established = 0;
609
614
        }
610
 
        if (sshpam_session_open) {
611
 
                debug("PAM: closing session");
612
 
                pam_close_session(sshpam_handle, PAM_SILENT);
613
 
                sshpam_session_open = 0;
614
 
        }
615
615
        sshpam_authenticated = 0;
616
616
        pam_end(sshpam_handle, sshpam_err);
617
617
        sshpam_handle = NULL;