[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-69-g4543b88

[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  4543b88b71d4598a3c9e49d44c59ab5ae54c4848 (commit)
       via  f49593cd1ad5b1e79eaf24585b5b4425f17f28f2 (commit)
       via  d6c6b355b3bf4da491003e79ee4790d13930a892 (commit)
      from  e5d39ad8e0eca30a626b1acefa6a8d77ed26cb8e (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=4543b88b71d4598a3c9e49d44c59ab5ae54c4848


commit 4543b88b71d4598a3c9e49d44c59ab5ae54c4848
Author: Mats Erik Andersson <address@hidden>
Date:   Mon Nov 22 11:13:34 2010 +0100

    inetd: Sanity check before using AI_V4MAPPED.

diff --git a/ChangeLog b/ChangeLog
index 79e5c92..daf9708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-11-22  Mats Erik Andersson <address@hidden>
 
+       * src/inetd.c (inetd_getaddrinfo): Do not use AI_V4MAPPED with
+       address family AF_INET.  FreeBSD fails otherwise.
+
+2010-11-22  Mats Erik Andersson <address@hidden>
+
        * ifconfig/flags.c (flag_char_tab): Protect the uses of
        IFF_NOTRAILERS by `#ifdef'.
 
diff --git a/src/inetd.c b/src/inetd.c
index f5f7d32..ce7592e 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -743,7 +743,7 @@ inetd_getaddrinfo (struct servtab *sep, int proto, struct 
addrinfo **result)
 
   hints.ai_flags = AI_PASSIVE;
 #ifdef AI_V4MAPPED
-  if (sep->se_v4mapped)
+  if (sep->se_v4mapped && (sep->se_family != AF_INET))
     hints.ai_flags |= AI_V4MAPPED;
 #endif
   hints.ai_family = sep->se_family;

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=f49593cd1ad5b1e79eaf24585b5b4425f17f28f2


commit f49593cd1ad5b1e79eaf24585b5b4425f17f28f2
Author: Mats Erik Andersson <address@hidden>
Date:   Mon Nov 22 11:08:25 2010 +0100

    ifconfig: Condition the use of IFF_NOTRAILERS.

diff --git a/ChangeLog b/ChangeLog
index b1df099..79e5c92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-11-22  Mats Erik Andersson <address@hidden>
 
+       * ifconfig/flags.c (flag_char_tab): Protect the uses of
+       IFF_NOTRAILERS by `#ifdef'.
+
+2010-11-22  Mats Erik Andersson <address@hidden>
+
        Regression caused by fe539ae9...797d881c
 
        * src/traceroute.c: Revert change from 2010-10-31.
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index 279b295..a4138df 100644
--- a/ifconfig/flags.c
+++ b/ifconfig/flags.c
@@ -398,7 +398,9 @@ static struct if_flag_char flag_char_tab[] = {
   { IFF_DYNAMIC,     'd' },
 #endif
   { IFF_PROMISC,     'P' },
+#ifdef IFF_NOTRAILERS
   { IFF_NOTRAILERS,  'N' },
+#endif
   { IFF_NOARP,       'O' },
   { IFF_POINTOPOINT, 'P' },
 #ifdef IFF_SLAVE

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=d6c6b355b3bf4da491003e79ee4790d13930a892


commit d6c6b355b3bf4da491003e79ee4790d13930a892
Author: Mats Erik Andersson <address@hidden>
Date:   Mon Nov 22 11:03:10 2010 +0100

    traceroute: Regression in handling of IP_TTL.

diff --git a/ChangeLog b/ChangeLog
index 7a520f8..b1df099 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-22  Mats Erik Andersson <address@hidden>
+
+       Regression caused by fe539ae9...797d881c
+
+       * src/traceroute.c: Revert change from 2010-10-31.
+       Change element `ttl' in `struct trace' to be plain `int'.
+       (trace_init): Change type of TTLP to be `const int *'.
+       Use `sizeof (*ttlp)' in both calls to setsockopt.
+       (trace_inc_ttl): Likewise.
+
 2010-11-21  Mike Frysinger <address@hidden>
 
        * configure.ac: Check for __rcmd_errstr.
diff --git a/src/traceroute.c b/src/traceroute.c
index f79e747..432e6e1 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -64,7 +64,7 @@ typedef struct trace
   int icmpfd, udpfd;
   enum trace_type type;
   struct sockaddr_in to, from;
-  unsigned char ttl;
+  int ttl;
   struct timeval tsent;
 } trace_t;
 
@@ -311,9 +311,9 @@ void
 trace_init (trace_t * t, const struct sockaddr_in to,
            const enum trace_type type)
 {
-  int ttl;
+  const int *ttlp;
   assert (t);
-  ttl = t->ttl;
+  ttlp = &t->ttl;
 
   t->type = type;
   t->to = to;
@@ -325,8 +325,8 @@ trace_init (trace_t * t, const struct sockaddr_in to,
       if (t->udpfd < 0)
         error (EXIT_FAILURE, errno, "socket");
 
-      if (setsockopt (t->udpfd, IPPROTO_IP, IP_TTL, &ttl,
-                     sizeof (ttl)) < 0)
+      if (setsockopt (t->udpfd, IPPROTO_IP, IP_TTL, ttlp,
+                     sizeof (*ttlp)) < 0)
         error (EXIT_FAILURE, errno, "setsockopt");
     }
 
@@ -340,7 +340,7 @@ trace_init (trace_t * t, const struct sockaddr_in to,
             error (EXIT_FAILURE, errno, "socket");
 
          if (setsockopt (t->icmpfd, IPPROTO_IP, IP_TTL,
-                         &ttl, sizeof (ttl)) < 0)
+                         ttlp, sizeof (*ttlp)) < 0)
             error (EXIT_FAILURE, errno, "setsockopt");
        }
       else
@@ -520,14 +520,14 @@ void
 trace_inc_ttl (trace_t * t)
 {
   int fd;
-  int ttl;
+  const int *ttlp;
 
   assert (t);
 
-  ttl = t->ttl;
+  ttlp = &t->ttl;
   t->ttl++;
   fd = (t->type == TRACE_UDP ? t->udpfd : t->icmpfd);
-  if (setsockopt (fd, IPPROTO_IP, IP_TTL, &ttl, sizeof (ttl)) < 0)
+  if (setsockopt (fd, IPPROTO_IP, IP_TTL, ttlp, sizeof (*ttlp)) < 0)
     error (EXIT_FAILURE, errno, "setsockopt");
 }
 

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

Summary of changes:
 ChangeLog        |   20 ++++++++++++++++++++
 ifconfig/flags.c |    2 ++
 src/inetd.c      |    2 +-
 src/traceroute.c |   18 +++++++++---------
 4 files changed, 32 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU Inetutils