[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-141-ga1df58a

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  a1df58afcb9f63e97ec6b944432a09ae52ed51a4 (commit)
      from  eb139e0534d61c51226ddd6c436c655f94532b1e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a1df58afcb9f63e97ec6b944432a09ae52ed51a4


commit a1df58afcb9f63e97ec6b944432a09ae52ed51a4
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Aug 3 03:34:38 2012 +0200

    Macro usage for socket lengths.

diff --git a/ChangeLog b/ChangeLog
index 85c70d8..4ac4f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-08-03  Mats Erik Andersson  <address@hidden>
+
+       * configure.ac: Check whether `struct sockaddr_in6'
+       contains sin6_len.  Correctly check for ut_addr_v6
+       inside `struct utmpx'.
+       * libinetutils/kcmd.c (kcmd) [SHISHI]: Condition on
+       HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN for access to ss_len.
+       (getport): Likewise.
+       * ping/libping.c (ping_set_dest): Access sin_len
+       conditioned on HAVE_STRUCT_SOCKADDR_IN_SIN_LEN.
+       * src/rexec.c (do_rexec): Build INET6 structure
+       guided by HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN.
+       * src/tftp.c (resolve_name): Access ss_len based on
+       HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN.
+       * src/tftpd.c (main): Likewise.
+
 2012-08-01  Mats Erik Andersson  <address@hidden>
 
        Better adaptions to different UTMP implementations.
diff --git a/configure.ac b/configure.ac
index 0c41949..a32dc9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -619,6 +619,9 @@ AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE([sig_atomic_t], 
int, [FIXME]),
 IU_CHECK_MEMBERS([struct sockaddr_in.sin_len], , ,
     [ #include <sys/types.h>
       #include <netinet/in.h> ])
+IU_CHECK_MEMBERS([struct sockaddr_in6.sin6_len], , ,
+    [ #include <sys/types.h>
+      #include <netinet/in.h> ])
 IU_CHECK_MEMBERS([struct sockaddr_storage.ss_len], , ,
     [ #include <sys/types.h>
       #include <netinet/in.h> ])
@@ -645,7 +648,7 @@ if test "$ac_cv_header_utmpx_h" = yes; then
                    struct utmpx.ut_exit, struct utmpx.ut_tv,
                    struct utmpx.ut_session, struct utmpx.ut_syslen,
                    struct utmpx.ut_host, struct utmpx.ut_ss,
-                   struct utmpx.ut_aadr_v6], , , [#include <utmpx.h>])
+                   struct utmpx.ut_addr_v6], , , [#include <utmpx.h>])
 fi
 
 IU_CHECK_MEMBERS([struct ifreq.ifr_index,
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 6a43882..1d1858b 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -232,7 +232,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short 
rport, char *locuser,
        {
        case AF_INET6:
          len = sizeof (struct sockaddr_in6);
-#  ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+#  ifdef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
          sin.ss_len = len;
 #  endif
          memcpy (&((struct sockaddr_in6 *) &sin)->sin6_addr,
@@ -242,7 +242,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short 
rport, char *locuser,
        case AF_INET:
        default:
          len = sizeof (struct sockaddr_in);
-#  ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+#  ifdef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
          sin.ss_len = len;
 #  endif
          memcpy (&((struct sockaddr_in *) &sin)->sin_addr,
@@ -500,7 +500,7 @@ getport (int *alport, int af)
   sin.ss_family = af;
   len = (af == AF_INET6) ? sizeof (struct sockaddr_in6)
        : sizeof (struct sockaddr_in);
-# ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+# ifdef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
   sin.ss_len = len;
 # endif
 
diff --git a/ping/libping.c b/ping/libping.c
index b847958..41d3f92 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -266,7 +266,7 @@ ping_set_dest (PING * ping, char *host)
 {
   struct sockaddr_in *s_in = &ping->ping_dest.ping_sockaddr;
   s_in->sin_family = AF_INET;
-#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
   s_in->sin_len = sizeof (*s_in);
 #endif
   if (inet_aton (host, &s_in->sin_addr))
diff --git a/src/rexec.c b/src/rexec.c
index cee880f..ebba784 100644
--- a/src/rexec.c
+++ b/src/rexec.c
@@ -295,7 +295,7 @@ do_rexec (struct arguments *arguments)
          ((struct sockaddr_in *) &serv_addr)->sin_port = arguments->err_port;
          break;
        case AF_INET6:
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
          ((struct sockaddr_in6 *) &serv_addr)->sin6_len = addrlen;
 #endif
          ((struct sockaddr_in6 *) &serv_addr)->sin6_family = addr.ss_family;
diff --git a/src/tftp.c b/src/tftp.c
index d85c14a..144d67a 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -328,7 +328,7 @@ resolve_name (char *name)
 
       memset (&ss, 0, sizeof (ss));
       ss.ss_family = ai->ai_family;
-#if HAVE_STRUCT_SOCKADDR_SA_LEN
+#if HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
       ss.ss_len = ai->ai_addrlen;
 #endif
       if (bind (f, (struct sockaddr *) &ss, ai->ai_addrlen))
diff --git a/src/tftpd.c b/src/tftpd.c
index 1112c78..f8f4cff 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -288,7 +288,7 @@ main (int argc, char *argv[])
     }
   memset (&sin, 0, sizeof (sin));
   sin.ss_family = from.ss_family;
-#if HAVE_STRUCT_SOCKADDR_SA_LEN
+#if HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
   sin.ss_len = from.ss_len;
 #endif
   if (bind (peer, (struct sockaddr *) &sin, fromlen) < 0)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   16 ++++++++++++++++
 configure.ac        |    5 ++++-
 libinetutils/kcmd.c |    6 +++---
 ping/libping.c      |    2 +-
 src/rexec.c         |    2 +-
 src/tftp.c          |    2 +-
 src/tftpd.c         |    2 +-
 7 files changed, 27 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU Inetutils