[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1_100-16-gb8e8c6e

[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  b8e8c6ebc54dc247aecca9563dddb16a1684e1e1 (commit)
      from  17518fbec9610f2ac9d2c576774917e419d7e4a5 (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=b8e8c6ebc54dc247aecca9563dddb16a1684e1e1


commit b8e8c6ebc54dc247aecca9563dddb16a1684e1e1
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Dec 13 10:44:29 2013 +0100

    inetd: Logging of resolution and binding errors.

diff --git a/ChangeLog b/ChangeLog
index 4e8b94a..9409a21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-12-10  Mats Erik Andersson  <address@hidden>
+
+       inetd: Logging of resolution and binding errors.
+
+       * src/inetd.c (setup): Alternate syslog format,
+       and debug message, when a service node has been set.
+       (expand_enter): Likewise, adding debug message.
+
+
+       ftp: Trivial misspelling.  Reported by Joe Steffee in
+       <http://lists.gnu.org/archive/html/bug-inetutils/2013-11/msg00000.html>.
+
+       * ftp/ftp.c (hookup): Spell `response' correctly.
+
 2013-11-28  Mats Erik Andersson  <address@hidden>
 
        rlogind, telnet, telnetd: Modify exit status.
diff --git a/ftp/ftp.c b/ftp/ftp.c
index d834c2c..5b72dc0 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -220,7 +220,7 @@ hookup (char *host, int port)
 
   if (ai == NULL)
     {
-      error (0, 0, "no respons from host");
+      error (0, 0, "no response from host");
       code = -1;
       goto bad;
     }
diff --git a/src/inetd.c b/src/inetd.c
index 7d1cd5e..1fc2112 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -645,10 +645,22 @@ setup (struct servtab *sep)
          close (sep->se_fd);
          goto tryagain;
        }
-      if (debug)
-       fprintf (stderr, "bind failed on %s/%s: %s\n",
-                sep->se_service, sep->se_proto, strerror (errno));
-      syslog (LOG_ERR, "%s/%s: bind: %m", sep->se_service, sep->se_proto);
+      if (sep->se_node)
+       {
+         if (debug)
+           fprintf (stderr, "bind failed for %s %s/%s: %s\n",
+                    sep->se_node, sep->se_service, sep->se_proto,
+                    strerror (errno));
+         syslog (LOG_ERR,"%s %s/%s: bind: %m",
+                 sep->se_node, sep->se_service, sep->se_proto);
+       }
+      else
+       {
+         if (debug)
+           fprintf (stderr, "bind failed for %s/%s: %s\n",
+                    sep->se_service, sep->se_proto, strerror (errno));
+         syslog (LOG_ERR,"%s/%s: bind: %m", sep->se_service, sep->se_proto);
+       }
       close (sep->se_fd);
       sep->se_fd = -1;
       if (!timingout)
@@ -871,8 +883,22 @@ expand_enter (struct servtab *sep)
       else
        errmsg = gai_strerror (err);
 
-      syslog (LOG_ERR, "%s/%s: getaddrinfo: %s",
-             sep->se_service, sep->se_proto, errmsg);
+      if (sep->se_node)
+       {
+         if (debug)
+           fprintf (stderr, "resolution of %s %s/%s failed: %s\n",
+                    sep->se_node, sep->se_service, sep->se_proto, errmsg);
+         syslog (LOG_ERR, "%s %s/%s: getaddrinfo: %s",
+                 sep->se_node, sep->se_service, sep->se_proto, errmsg);
+       }
+      else
+       {
+         if (debug)
+           fprintf (stderr, "resolution of %s/%s failed: %s\n",
+                    sep->se_service, sep->se_proto, errmsg);
+         syslog (LOG_ERR, "%s/%s: getaddrinfo: %s",
+                 sep->se_service, sep->se_proto, errmsg);
+       }
       return 1;
     }
 

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

Summary of changes:
 ChangeLog   |   14 ++++++++++++++
 ftp/ftp.c   |    2 +-
 src/inetd.c |   38 ++++++++++++++++++++++++++++++++------
 3 files changed, 47 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils