Attachment 901 Details for Bug 1032 – Update on patch for hpux

[patch] Update on patch for hpux

PrintLastLog-UseLogin.patch (text/plain), 3.04 KB, created by senthilkumar on 2005-05-06 22:18:28 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: senthilkumar

Created: 2005-05-06 22:18:28 AEST

Size: 3.04 KB

patch

obsolete

>--- openssh-4.0p1/session.c     2005-03-06 17:08:52.000000000 +0530
>+++ openssh-4.0p1-lastlog/session.c     2005-05-06 16:50:15.000000000 +0530
>@@ -646,9 +646,15 @@
>                }
>        }
>
>+#ifdef __hpux
>+       record_utmp_only(pid, s->tty, s->pw->pw_name, s->pw->pw_uid,
>+           get_remote_name_or_ip(utmp_len, options.use_dns),
>+           (struct sockaddr *)&from, fromlen);
>+#else
>        record_utmp_only(pid, s->tty, s->pw->pw_name,
>            get_remote_name_or_ip(utmp_len, options.use_dns),
>            (struct sockaddr *)&from, fromlen);
>+#endif
> }
> #endif
>
>diff -Nur openssh-4.0p1/sshlogin.c openssh-4.0p1-lastlog/sshlogin.c
>--- openssh-4.0p1/sshlogin.c    2004-08-13 16:51:47.000000000 +0530
>+++ openssh-4.0p1-lastlog/sshlogin.c    2005-05-06 16:59:41.000000000 +0530
>@@ -69,7 +69,12 @@
>  * Generate and store last login message.  This must be done before
>  * login_login() is called and lastlog is updated.
>  */
>+
>+#ifdef __hpux
>+void
>+#else
> static void
>+#endif
> store_lastlog_message(const char *user, uid_t uid)
> {
>        char *time_string, hostname[MAXHOSTNAMELEN] = "", buf[512];
>@@ -93,6 +98,11 @@
>                        snprintf(buf, sizeof(buf), "Last login: %s from %s\r\n",
>                            time_string, hostname);
>                buffer_append(&loginmsg, buf, strlen(buf));
>+#ifdef __hpux
>+       if(options.use_login)
>+                printf("%s", (char *)buffer_ptr(&loginmsg));
>+#endif
>+
>        }
> #endif /* NO_SSH_LASTLOG */
> }
>@@ -117,12 +127,23 @@
> }
>
> #ifdef LOGIN_NEEDS_UTMPX
>+#ifdef __hpux
> void
>-record_utmp_only(pid_t pid, const char *ttyname, const char *user,
>+record_utmp_only(pid_t pid, const char *ttyname, const char *user, uid_t uid,
>                 const char *host, struct sockaddr * addr, socklen_t addrlen)
>+#else
>+void
>+record_utmp_only(pid_t pid, const char *ttyname, const char *user,
>+               const char *host, struct sockaddr * addr, socklen_t addrlen)
>+#endif
> {
>        struct logininfo *li;
>
>+#ifdef __hpux
>+       /* save previous login details before writing new */
>+        store_lastlog_message(user, uid);
>+#endif
>+
>        li = login_alloc_entry(pid, user, host, ttyname);
>        login_set_addr(li, addr, addrlen);
>        login_utmp_only(li);
>diff -Nur openssh-4.0p1/sshlogin.h openssh-4.0p1-lastlog/sshlogin.h
>--- openssh-4.0p1/sshlogin.h    2003-01-02 05:13:56.000000000 +0530
>+++ openssh-4.0p1-lastlog/sshlogin.h    2005-05-06 16:51:10.000000000 +0530
>@@ -21,8 +21,17 @@
> u_long         get_last_login_time(uid_t, const char *, char *, u_int);
>
> #ifdef LOGIN_NEEDS_UTMPX
>-void   record_utmp_only(pid_t, const char *, const char *, const char *,
>+#ifdef __hpux
>+void   record_utmp_only(pid_t, const char *, const char *, uid_t, const char *,
>                struct sockaddr *, socklen_t);
>+#else
>+void    record_utmp_only(pid_t, const char *, const char *, const char *,
>+               struct sockaddr *, socklen_t);
>+#endif
>+#endif
>+
>+#ifdef __hpux
>+void store_lastlog_message(const char *user, uid_t uid);
> #endif
>
> #endif

Actions: View | Diff

Attachments on bug 1032: 899 | 901 | 905 | 921