1999-06-18 11:37:30 +00:00
|
|
|
--- login.c.orig Wed May 12 12:19:26 1999
|
|
|
|
|
+++ login.c Fri Jun 18 12:11:20 1999
|
|
|
|
|
@@ -117,6 +117,9 @@
|
|
|
|
|
#include <hpsecurity.h>
|
|
|
|
|
#include <prot.h>
|
|
|
|
|
#endif /* HAVE_HPUX_TCB_AUTH */
|
|
|
|
|
+#ifdef __FreeBSD__
|
|
|
|
|
+#include <osreldate.h>
|
|
|
|
|
+#endif
|
|
|
|
|
#include "ssh.h"
|
|
|
|
|
|
|
|
|
|
/* Returns the time when the user last logged in. Returns 0 if the
|
|
|
|
|
@@ -301,12 +304,15 @@
|
1999-04-11 09:08:31 +00:00
|
|
|
strncpy(u.ut_user, user, sizeof(u.ut_user));
|
|
|
|
|
#endif /* HAVE_NAME_IN_UTMP */
|
|
|
|
|
#ifdef HAVE_HOST_IN_UTMP
|
|
|
|
|
- strncpy(u.ut_host, host, sizeof(u.ut_host));
|
|
|
|
|
#ifdef __FreeBSD__
|
1999-06-18 11:37:30 +00:00
|
|
|
+#if __FreeBSD_version >= 320000
|
1999-04-11 09:08:31 +00:00
|
|
|
+ trimdomain(host, sizeof u.ut_host);
|
1999-06-18 11:37:30 +00:00
|
|
|
+#endif
|
1999-04-11 09:08:31 +00:00
|
|
|
if (strlen(host) > sizeof(u.ut_host)) {
|
|
|
|
|
strncpy(u.ut_host, get_remote_ipaddr(), sizeof(u.ut_host));
|
|
|
|
|
- }
|
|
|
|
|
+ } else
|
|
|
|
|
#endif /* __FreeBSD__ */
|
|
|
|
|
+ strncpy(u.ut_host, host, sizeof(u.ut_host));
|
|
|
|
|
#endif /* HAVE_HOST_IN_UTMP */
|
|
|
|
|
#ifdef HAVE_ADDR_IN_UTMP
|
|
|
|
|
if (addr)
|
