Attachment 969 Details for Bug 1087 – Rework patch #962

[patch] Rework patch #962

openssh-pam_msg.patch (text/plain), 1.06 KB, created by Darren Tucker on 2005-09-28 21:01:53 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2005-09-28 21:01:53 AEST

Size: 1.06 KB

patch

obsolete

>Index: auth2.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth2.c,v
>retrieving revision 1.136
>diff -u -p -r1.136 auth2.c
>--- auth2.c	24 Sep 2005 02:43:51 -0000	1.136
>+++ auth2.c	28 Sep 2005 10:44:02 -0000
>@@ -222,13 +222,17 @@ userauth_finish(Authctxt *authctxt, int 
> 
> #ifdef USE_PAM
> 	if (options.use_pam && authenticated) {
>-		if (!PRIVSEP(do_pam_account())) {
>-			/* if PAM returned a message, send it to the user */
>-			if (buffer_len(&loginmsg) > 0) {
>-				buffer_append(&loginmsg, "\0", 1);
>-				userauth_send_banner(buffer_ptr(&loginmsg));
>-				packet_write_wait();
>-			}
>+		int success;
>+
>+		success = PRIVSEP(do_pam_account());
>+		/* if PAM returned a message, send it to the user */
>+		if (buffer_len(&loginmsg) > 0) {
>+			buffer_append(&loginmsg, "\0", 1);
>+			userauth_send_banner(buffer_ptr(&loginmsg));
>+			packet_write_wait();
>+			buffer_clear(&loginmsg);
>+		}
>+		if (!success) {
> 			fatal("Access denied for user %s by PAM account "
> 			    "configuration", authctxt->user);
> 		}

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 1087: 960 | 961 | 962 | 969 | 972