Attachment 1634 Details for Bug 1595 – Updated patch: loginrec.c plus minor style nits

[patch] Updated patch: loginrec.c plus minor style nits

openssh-aix-printlastlog.patch (text/plain), 2.79 KB, created by Darren Tucker on 2009-05-04 13:06:26 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2009-05-04 13:06:26 AEST

Size: 2.79 KB

patch

obsolete

>Index: auth.c
>===================================================================
>RCS file: /home/dtucker/openssh/cvs/openssh/auth.c,v
>retrieving revision 1.132
>diff -u -p -r1.132 auth.c
>--- auth.c	5 Nov 2008 05:12:54 -0000	1.132
>+++ auth.c	4 May 2009 02:41:56 -0000
>@@ -284,7 +284,8 @@ auth_log(Authctxt *authctxt, int authent
> # ifdef WITH_AIXAUTHENTICATE
> 	if (authenticated)
> 		sys_auth_record_login(authctxt->user,
>-		    get_canonical_hostname(options.use_dns), "ssh", &loginmsg);
>+		    get_canonical_hostname(options.use_dns), "ssh", &loginmsg,
>+		    options.print_lastlog);
> # endif
> #endif
> #ifdef SSH_AUDIT_EVENTS
>Index: loginrec.c
>===================================================================
>RCS file: /home/dtucker/openssh/cvs/openssh/loginrec.c,v
>retrieving revision 1.84
>diff -u -p -r1.84 loginrec.c
>--- loginrec.c	12 Feb 2009 02:12:22 -0000	1.84
>+++ loginrec.c	4 May 2009 02:47:11 -0000
>@@ -175,6 +175,9 @@
> #include "canohost.h"
> #include "auth.h"
> #include "buffer.h"
>+#include "servconf.h"
>+
>+extern ServerOptions options;
> 
> #ifdef HAVE_UTIL_H
> # include <util.h>
>@@ -462,7 +465,7 @@ login_write(struct logininfo *li)
> #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN
> 	if (li->type == LTYPE_LOGIN &&
> 	    !sys_auth_record_login(li->username,li->hostname,li->line,
>-	    &loginmsg))
>+	    &loginmsg, options.print_lastlog))
> 		logit("Writing login record failed for %s", li->username);
> #endif
> #ifdef SSH_AUDIT_EVENTS
>Index: openbsd-compat/port-aix.c
>===================================================================
>RCS file: /home/dtucker/openssh/cvs/openssh/openbsd-compat/port-aix.c,v
>retrieving revision 1.43
>diff -u -p -r1.43 port-aix.c
>--- openbsd-compat/port-aix.c	9 Mar 2008 05:36:55 -0000	1.43
>+++ openbsd-compat/port-aix.c	4 May 2009 02:55:04 -0000
>@@ -284,7 +284,8 @@ sys_auth_record_login(const char *user, 
> 		success = 1;
> 		if (msg != NULL && loginmsg != NULL && !msg_done) {
> 			debug("AIX/loginsuccess: msg %s", msg);
>-			buffer_append(loginmsg, msg, strlen(msg));
>+			if (print_lastlog)
>+				buffer_append(loginmsg, msg, strlen(msg));
> 			xfree(msg);
> 			msg_done = 1;
> 		}
>Index: openbsd-compat/port-aix.h
>===================================================================
>RCS file: /home/dtucker/openssh/cvs/openssh/openbsd-compat/port-aix.h,v
>retrieving revision 1.29
>diff -u -p -r1.29 port-aix.h
>--- openbsd-compat/port-aix.h	9 Mar 2008 05:36:55 -0000	1.29
>+++ openbsd-compat/port-aix.h	4 May 2009 01:08:43 -0000
>@@ -86,7 +86,7 @@ void aix_usrinfo(struct passwd *);
> # define CUSTOM_SYS_AUTH_ALLOWED_USER 1
> int sys_auth_allowed_user(struct passwd *, Buffer *);
> # define CUSTOM_SYS_AUTH_RECORD_LOGIN 1
>-int sys_auth_record_login(const char *, const char *, const char *, Buffer *);
>+int sys_auth_record_login(const char *, const char *, const char *, Buffer *, int);
> # define CUSTOM_FAILED_LOGIN 1
> #endif
>

Actions: View | Diff

Attachments on bug 1595: 1631 | 1632 | 1633 | 1634 | 1635 | 1636