- (djm) Fix address logging in utmp from Kevin Steves

   <stevesk@sweden.hp.com>

diff --git a/ChangeLog b/ChangeLog
index 1d232d06b5f3f94a7792495d3f6fbfbc88937d9c..9a8a3965eaf80a496fa874f7b45033ed4e0c62d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20000923
+ - (djm) Fix address logging in utmp from Kevin Steves 
+   <stevesk@sweden.hp.com>
+
 20000920
  - (djm) Fix bad path substitution. Report from Andrew Miner
    <asminer@cs.iastate.edu>

diff --git a/configure.in b/configure.in
index b03905f9aae161efadca6fb338085a454416c5c0..774529d308c8cb433049a6ef5f7a68b0c3b4cb96 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -74,6 +74,7 @@ case "$host" in
        IPADDR_IN_DISPLAY=yes
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(DISABLE_SHADOW)
+       AC_DEFINE(DISABLE_UTMP)
        LIBS="$LIBS -lsec"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
@@ -83,6 +84,7 @@ case "$host" in
        IPADDR_IN_DISPLAY=yes
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(DISABLE_SHADOW)
+       AC_DEFINE(DISABLE_UTMP)
        LIBS="$LIBS -lsec"
        MANTYPE='$(CATMAN)'
        mansubdir=cat

diff --git a/loginrec.c b/loginrec.c
index be6b18f97c9e4360e4c55607a30e6ebc4a8b1a08..4f9f30adad60392bfed14734b39a6a13fe07191a 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -678,7 +678,10 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
        strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname));
 # endif
 # ifdef HAVE_ADDR_IN_UTMPX
-       /* FIXME: (ATL) not supported yet */
+       /* this is just a 32-bit IP address */
+       if (li->hostaddr.sa.sa_family == AF_INET)
+               utx->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
+ # endif
 # endif
 # ifdef HAVE_SYSLEN_IN_UTMPX
        /* ut_syslen is the length of the utx_host string */