Attachment #905 for bug #1032

Line Link Here

(-)file_not_specified_in_diff (-1 / +7 lines)
0	-- openssh-4.0p1/session.c 2005-03-06 17:08:52.000000000 +0530	0	++ openssh-4.0p1-lastlog/session.c 2005-05-06 16:50:15.000000000 +0530
Lines 646-654 Link Here
646	}	646	}
647	}	647	}
		648	#ifdef __hpux
		649	record_utmp_only(pid, s->tty, s->pw->pw_name, s->pw->pw_uid,
		650	get_remote_name_or_ip(utmp_len, options.use_dns),
		651	(struct sockaddr *)&from, fromlen);
		652	#else
648	record_utmp_only(pid, s->tty, s->pw->pw_name,	653	record_utmp_only(pid, s->tty, s->pw->pw_name,
649	get_remote_name_or_ip(utmp_len, options.use_dns),	654	get_remote_name_or_ip(utmp_len, options.use_dns),
650	(struct sockaddr *)&from, fromlen);	655	(struct sockaddr *)&from, fromlen);
		656	#endif
651	}	657	}
652	#endif	658	#endif

Lines 93-98 Link Here

(-)openssh-4.0p1/sshlogin.c (-1 / +17 lines)
93	snprintf(buf, sizeof(buf), "Last login: %s from %s\r\n",	93	snprintf(buf, sizeof(buf), "Last login: %s from %s\r\n",
94	time_string, hostname);	94	time_string, hostname);
95	buffer_append(&loginmsg, buf, strlen(buf));	95	buffer_append(&loginmsg, buf, strlen(buf));
		96	#ifdef __hpux
		97	if(options.use_login)
		98	printf("%s", (char *)buffer_ptr(&loginmsg));
		99	#endif
		100
96	}	101	}
97	#endif /* NO_SSH_LASTLOG */	102	#endif /* NO_SSH_LASTLOG */
98	}	103	}
Lines 117-128 Link Here
117	}	122	}
118	#ifdef LOGIN_NEEDS_UTMPX	123	#ifdef LOGIN_NEEDS_UTMPX
		124	#ifdef __hpux
119	void	125	void
120	record_utmp_only(pid_t pid, const char ttyname, const char user,	126	record_utmp_only(pid_t pid, const char ttyname, const char user, uid_t uid,
121	const char host, struct sockaddr addr, socklen_t addrlen)	127	const char host, struct sockaddr addr, socklen_t addrlen)
		128	#else
		129	void
		130	record_utmp_only(pid_t pid, const char ttyname, const char user,
		131	const char host, struct sockaddr addr, socklen_t addrlen)
		132	#endif
122	{	133	{
123	struct logininfo *li;	134	struct logininfo *li;
		135	#ifdef __hpux
		136	/* save previous login details before writing new */
		137	store_lastlog_message(user, uid);
		138	#endif
		139
124	li = login_alloc_entry(pid, user, host, ttyname);	140	li = login_alloc_entry(pid, user, host, ttyname);
125	login_set_addr(li, addr, addrlen);	141	login_set_addr(li, addr, addrlen);
126	login_utmp_only(li);	142	login_utmp_only(li);

Lines 21-28 Link Here

(-)openssh-4.0p1/sshlogin.h (-1 / +6 lines)
21	u_long get_last_login_time(uid_t, const char , char , u_int);	21	u_long get_last_login_time(uid_t, const char , char , u_int);
22	#ifdef LOGIN_NEEDS_UTMPX	22	#ifdef LOGIN_NEEDS_UTMPX
23	void record_utmp_only(pid_t, const char , const char , const char *,	23	#ifdef __hpux
		24	void record_utmp_only(pid_t, const char , const char , uid_t, const char *,
24	struct sockaddr *, socklen_t);	25	struct sockaddr *, socklen_t);
		26	#else
		27	void record_utmp_only(pid_t, const char , const char , const char *,
		28	struct sockaddr *, socklen_t);
		29	#endif
25	#endif	30	#endif

Return to bug 1032