[SCM] GNU Inetutils branch, master, updated. inetutils-1_6-104-gf688407

[Alfred M. Szmidt]

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  f688407791acf4379847bf36816d90ae195689cb (commit)
       via  48aa0838666bb625442dfc9f36252651d7b44f15 (commit)
       via  5a87d05296bfed94b8eefb1e6cabc0f584f2bf6a (commit)
      from  76d5bff07113970a1f069c3c99c8412283b19117 (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=f688407791acf4379847bf36816d90ae195689cb


commit f688407791acf4379847bf36816d90ae195689cb
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Dec 3 11:18:19 2009 +0100

    inetd/inetd.c (setup) [IPV6]: Reverse the value of SEP->se_v4mapped
    before setting socket options.  Reported by Ross Alexander
    <address@hidden>.

diff --git a/ChangeLog b/ChangeLog
index 7f1787f..ade023e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-03  Alfred M. Szmidt  <address@hidden>
+
+       * inetd/inetd.c (setup) [IPV6]: Reverse the value of
+       SEP->se_v4mapped before setting socket options.  Reported by Ross
+       Alexander <address@hidden>.
+
 2009-11-23  Alfred M. Szmidt  <address@hidden>
 
        * ping/ping6.c (argp_options) <numeric>: Fix typo.
diff --git a/inetd/inetd.c b/inetd/inetd.c
index f2c1e3b..d0a281c 100644
--- a/inetd/inetd.c
+++ b/inetd/inetd.c
@@ -581,7 +581,11 @@ setup (struct servtab *sep)
 #ifdef IPV6
   if (sep->se_family == AF_INET6)
     {
-      int val = sep->se_v4mapped;
+      /* Reverse the value of SEP->se_v4mapped, since otherwise if
+        using `tcp' as a protocol type all connections will be mapped
+        to IPv6, and with `tcp6' they get mapped IPv4 mapped to
+        IPv6.  */
+      int val = sep->se_v4mapped ? 0 : 1;
       if (setsockopt (sep->se_fd, IPPROTO_IPV6, IPV6_V6ONLY,
                      (char *) &val, sizeof (val)) < 0)
        syslog (LOG_ERR, "setsockopt (IPV6_V6ONLY): %m");

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


commit 48aa0838666bb625442dfc9f36252651d7b44f15
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Nov 23 22:07:34 2009 +0100

    Updated.

diff --git a/TODO b/TODO
index 44f3569..472a73b 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,11 @@
 * General
 
+ifconfig: when a unknown format option is passed to --format, ifconfig
+  will output the name of the format twice.
+
+  % ifconfig --format=unknown
+  unknownunknown%
+
 Add framework for tests.
 
 Function for parsing address@hidden:PORT], that returns each value

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


commit 5a87d05296bfed94b8eefb1e6cabc0f584f2bf6a
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Nov 23 16:10:18 2009 +0100

    ping/ping6.c (argp_options) <numeric>: Fix typo.

diff --git a/ChangeLog b/ChangeLog
index cd986cf..7f1787f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-23  Alfred M. Szmidt  <address@hidden>
+
+       * ping/ping6.c (argp_options) <numeric>: Fix typo.
+
 2009-11-16  Simon Josefsson  <address@hidden>
 
        * tests/ping-localhost.sh: Call the right executable.  Support
diff --git a/ping/ping6.c b/ping/ping6.c
index e4db905..20d4f21 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -77,7 +77,7 @@ static struct argp_option argp_options[] = {
   {"debug", 'd', NULL, 0, "set the SO_DEBUG option", GRP+1},
   {"interval", 'i', "NUMBER", 0, "wait NUMBER seconds between sending each "
    "packet", GRP+1},
-  {"numeric", 'n', NULL, 0, "so not resolve host addresses", GRP+1},
+  {"numeric", 'n', NULL, 0, "do not resolve host addresses", GRP+1},
   {"ignore-routing", 'r', NULL, 0, "send directly to a host on an attached "
    "network", GRP+1},
   {"timeout", 'w', "N", 0, "stop after N seconds", GRP+1},

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

Summary of changes:
 ChangeLog     |   10 ++++++++++
 TODO          |    6 ++++++
 inetd/inetd.c |    6 +++++-
 ping/ping6.c  |    2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils