Attachment 2194 Details for Bug 2049 – Always send PAM auth+account messages via banner

[patch] Always send PAM auth+account messages via banner

openssh-pam-account-always.patch (text/plain), 1010 bytes, created by Darren Tucker on 2012-11-23 11:26:59 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2012-11-23 11:26:59 AEDT

Size: 1010 bytes

patch

obsolete

>Index: auth2.c
>===================================================================
>RCS file: /home/dtucker/openssh/cvs/openssh/auth2.c,v
>retrieving revision 1.155
>diff -u -p -r1.155 auth2.c
>--- auth2.c	4 Nov 2012 12:21:41 -0000	1.155
>+++ auth2.c	22 Nov 2012 23:56:16 -0000
>@@ -314,16 +314,18 @@ userauth_finish(Authctxt *authctxt, int 
> 
> #ifdef USE_PAM
> 	if (options.use_pam && authenticated) {
>-		if (!PRIVSEP(do_pam_account())) {
>+		int success = PRIVSEP(do_pam_account());
>+
>+		if (buffer_len(&loginmsg) > 0) {
> 			/* 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_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);
>-		}
> 	}
> #endif
>

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 2049: 2194