From 6dacdb9ad0fb1c8fc630e505693e0bd7ea857ea7 Mon Sep 17 00:00:00 2001
From: Werner Fink <werner@suse.de>
Date: Fri, 11 Mar 2011 16:51:07 +0000
Subject: [PATCH] * Try to make utmpdump IPv6 valid, change based on suggestion
 from   Navdeep Bhatia (see local bug #32429)

---
 doc/Changelog  |  2 ++
 src/utmpdump.c | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 9983501..bb68e11 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 sysvinit (2.89dsf) UNRELEASED; urgency=low
 
   [ Werner Fink ]
+  * Try to make utmpdump IPv6 valid, change based on suggestion from
+    Navdeep Bhatia (see local bug #32429)
   * Fix signal and alarm handling based on the patch from Florent Viard.
     (was local bug #32304)
   * Add fix for Redhat bug #573346: last incorrectly displays IPv6
diff --git a/src/utmpdump.c b/src/utmpdump.c
index 97f9869..cef8cc3 100644
--- a/src/utmpdump.c
+++ b/src/utmpdump.c
@@ -128,11 +128,21 @@ unspace(char *s, int len)
 void
 print_utline(struct utmp ut)
 {
-	char *addr_string, *time_string;
-	struct in_addr in;
+	char addr_buf[INET6_ADDRSTRLEN+1];
+	const char *addr_string, *time_string;
+	void *in_addr = &ut.ut_addr_v6;
+	size_t addr_length = INET6_ADDRSTRLEN;
+	int addr_family = AF_INET6;
 
-	in.s_addr = ut.ut_addr;
-	addr_string = inet_ntoa(in);
+	if (!ut.ut_addr_v6[1] && !ut.ut_addr_v6[2] && !ut.ut_addr_v6[3]) {
+		addr_family = AF_INET;
+		addr_length = INET_ADDRSTRLEN;
+		in_addr = &ut.ut_addr;
+	}
+	if ((addr_string = inet_ntop(addr_family, in_addr, addr_buf, addr_length)) == 0) {
+		addr_buf[0] = '\0';
+		addr_string = &addr_buf[0];
+	}
 	time_string = timetostr(ut.ut_time);
 	cleanse(ut.ut_id);
 	cleanse(ut.ut_user);