From: Florian Weimer <fweimer@redhat.com>
Date: Sun, 1 Jan 2017 08:35:45 +0000 (+0100)
Subject: support: struct netent portability fix for support_format_netent
X-Git-Tag: glibc-2.25~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73dfd088936b9237599e4ab737c7ae2ea7d710e1;p=thirdparty%2Fglibc.git

support: struct netent portability fix for support_format_netent
---

diff --git a/ChangeLog b/ChangeLog
index 7b7508b36d9..8a163cc770e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-01  Florian Weimer  <fweimer@redhat.com>
+
+	* support/support_format_netent.c (support_format_netent): Work
+	around alpha struct netent definition difference.
+
 2017-01-01  Florian Weimer  <fweimer@redhat.com>
 
 	* support/xwrite.c (xwrite): Use %td for pointer difference.
diff --git a/support/support_format_netent.c b/support/support_format_netent.c
index 73cd0fee616..020f5720d92 100644
--- a/support/support_format_netent.c
+++ b/support/support_format_netent.c
@@ -43,7 +43,9 @@ support_format_netent (struct netent *e)
     fprintf (mem.out, "alias: %s\n", *ap);
   if (e->n_addrtype != AF_INET)
     fprintf (mem.out, "addrtype: %d\n", e->n_addrtype);
-  fprintf (mem.out, "net: 0x%08x\n", e->n_net);
+  /* On alpha, e->n_net is an unsigned long.  */
+  unsigned int n_net = e->n_net;
+  fprintf (mem.out, "net: 0x%08x\n", n_net);
 
   xfclose_memstream (&mem);
   return mem.buffer;