[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-40-g154eba0

[Simon Josefsson]

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  154eba0782a693440f99830c88f2697977c1bff2 (commit)
      from  0d81d7e7e886f7e788ea7191418f8327416ef246 (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=154eba0782a693440f99830c88f2697977c1bff2


commit 154eba0782a693440f99830c88f2697977c1bff2
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Oct 1 17:12:13 2010 +0200

    src/inetd.c: Fix typos in comments.
    Signed-off-by: Simon Josefsson <address@hidden>

diff --git a/ChangeLog b/ChangeLog
index 8544e22..434d6d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-01  Mats Erik Andersson <address@hidden>
+
+       * src/inetd.c (setup, expand_enter, getconfigent, prepenv): Fix
+       comments.
+
 2010-09-18  Mats Erik Andersson <address@hidden>
 
        * ping/ping6.c: Include <sys/uio.h> for knowing "struct iov" in BSD.
diff --git a/src/inetd.c b/src/inetd.c
index 6fe9adf..9a43271 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -547,7 +547,7 @@ setup (struct servtab *sep)
       if (errno == EAFNOSUPPORT && sep->se_family == AF_INET6
          && sep->se_v4mapped)
        {
-         /* Fall back to IPv6 silently.  */
+         /* Fall back to IPv4 silently.  */
          sep->se_family = AF_INET;
          goto tryagain;
        }
@@ -563,9 +563,8 @@ setup (struct servtab *sep)
   if (sep->se_family == AF_INET6)
     {
       /* 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.  */
+        using `tcp' as a protocol type, all connections will be mapped
+        to IPv6, and with `tcp6', IPv4 get mapped to IPv6.  */
       int val = sep->se_v4mapped ? 0 : 1;
       if (setsockopt (sep->se_fd, IPPROTO_IPV6, IPV6_V6ONLY,
                      (char *) &val, sizeof (val)) < 0)
@@ -592,7 +591,7 @@ setup (struct servtab *sep)
       if ((errno == EADDRNOTAVAIL || errno == EAFNOSUPPORT)
          && sep->se_family == AF_INET6 && sep->se_v4mapped)
        {
-         /* Fall back to IPv6 silently.  */
+         /* Fall back to IPv4 silently.  */
          sep->se_family = AF_INET;
          close (sep->se_fd);
          goto tryagain;
@@ -779,7 +778,7 @@ expand_enter (struct servtab *sep)
   if (err == EAI_ADDRFAMILY
       && sep->se_family == AF_INET6 && sep->se_v4mapped)
     {
-      /* Fall back to IPv6 silently.  */
+      /* Fall back to IPv4 silently.  */
       sep->se_family = AF_INET;
       err = inetd_getaddrinfo (sep, proto->p_proto, &result);
     }
@@ -1002,7 +1001,7 @@ getconfigent (FILE *fconfig, const char *file, size_t 
*line)
       sep->se_proto = newstr (argv[INETD_PROTOCOL]);
 
 #ifdef IPV6
-      /* We default to IPv6, in setup() we'll fall back to IPv4 if
+      /* We default to IPv6.  In setup() we'll fall back to IPv4 if
          it doesn't work.  */
       sep->se_family = AF_INET6;
       sep->se_v4mapped = 1;
@@ -1674,7 +1673,7 @@ tcpmux (int s, struct servtab *sep)
 
 /* Set TCP environment variables, modelled after djb's ucspi-tcp tools:
    http://cr.yp.to/ucspi-tcp/environment.html
-   FIXME: This needs support for IPv6
+   FIXME: This needs support for IPv6.
 */
 void
 prepenv (int ctrl, struct sockaddr_in sa_client)

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

Summary of changes:
 ChangeLog   |    5 +++++
 src/inetd.c |   15 +++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU Inetutils