support NetBSD's utmpx.ut_ss address field

bz#960, ok dtucker

diff --git a/configure.ac b/configure.ac
index 0a2eb0448e39cf6051beb224670993b9de26331a..33a82814b12781fd63356b80eea862f9fbf4fa3f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4207,6 +4207,7 @@ OSSH_CHECK_HEADER_FOR_FIELD([ut_exit], [utmp.h], [HAVE_EXIT_IN_UTMP])
 OSSH_CHECK_HEADER_FOR_FIELD([ut_time], [utmp.h], [HAVE_TIME_IN_UTMP])
 OSSH_CHECK_HEADER_FOR_FIELD([ut_time], [utmpx.h], [HAVE_TIME_IN_UTMPX])
 OSSH_CHECK_HEADER_FOR_FIELD([ut_tv], [utmpx.h], [HAVE_TV_IN_UTMPX])
+OSSH_CHECK_HEADER_FOR_FIELD([ut_ss], [utmpx.h], [HAVE_SS_IN_UTMPX])
 
 AC_CHECK_MEMBERS([struct stat.st_blksize])
 AC_CHECK_MEMBERS([struct stat.st_mtim])

diff --git a/loginrec.c b/loginrec.c
index e5289deb83eb682b0d34a0555ab1d1b55eb8ba04..ea058fd6fa759b2640e2fbbabb9bedd13584d06e 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -778,6 +778,9 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
        strncpy(utx->ut_host, li->hostname,
            MIN_SIZEOF(utx->ut_host, li->hostname));
 # endif
+# ifdef HAVE_SS_IN_UTMPX
+       utx->ut_ss = li->hostaddr.sa_storage;
+# endif
 # ifdef HAVE_ADDR_IN_UTMPX
        /* this is just a 32-bit IP address */
        if (li->hostaddr.sa.sa_family == AF_INET)