Attachment 1339 Details for Bug 1322 – Patch #1325 with dead code removed.

[patch] Patch #1325 with dead code removed.

openssh-4.6p1-pamcleanup.patch (text/plain), 961 bytes, created by Darren Tucker on 2007-08-13 23:21:31 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2007-08-13 23:21:31 AEST

Size: 961 bytes

patch

obsolete

>Index: session.c
>===================================================================
>RCS file: /var/cvs/openssh/session.c,v
>retrieving revision 1.352
>diff -u -p -r1.352 session.c
>--- session.c	13 Aug 2007 13:11:56 -0000	1.352
>+++ session.c	13 Aug 2007 13:16:35 -0000
>@@ -2478,8 +2478,19 @@ do_cleanup(Authctxt *authctxt)
> 		return;
> 	called = 1;
> 
>-	if (authctxt == NULL || !authctxt->authenticated)
>+	if (authctxt == NULL)
> 		return;
>+
>+	if (!authctxt->authenticated) {
>+#ifdef USE_PAM
>+		if (options.use_pam) {
>+			sshpam_cleanup();
>+			sshpam_thread_cleanup();
>+		}
>+#endif
>+		return;
>+	}
>+
> #ifdef KRB5
> 	if (options.kerberos_ticket_cleanup &&
> 	    authctxt->krb5_ctx)
>@@ -2489,13 +2500,6 @@ do_cleanup(Authctxt *authctxt)
> #ifdef GSSAPI
> 	if (compat20 && options.gss_cleanup_creds)
> 		ssh_gssapi_cleanup_creds();
>-#endif
>-
>-#ifdef USE_PAM
>-	if (options.use_pam) {
>-		sshpam_cleanup();
>-		sshpam_thread_cleanup();
>-	}
> #endif
> 
> 	/* remove agent socket */

Flags:

dtucker: ok-

Actions: View | Diff

Attachments on bug 1322: 1307 | 1308 | 1325 | 1339 | 1342