[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-277-g6aec31d

[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  6aec31d308cf6fd350ccf42ba11b248f6f512d67 (commit)
      from  d3afcfa566f68e26060f465a0439af7e36ffe653 (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=6aec31d308cf6fd350ccf42ba11b248f6f512d67


commit 6aec31d308cf6fd350ccf42ba11b248f6f512d67
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Apr 25 20:31:48 2013 +0200

    syslogd: Probe recurring test errors.

diff --git a/ChangeLog b/ChangeLog
index 88cce1f..ac05bbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-04-25  Mats Erik Andersson  <address@hidden>
+
+       syslogd: Attempt to mend recurring test failures.
+       The autobuilder Hydra is fairly often reporting
+       failures for `tests/syslogd.sh' on GNU/Linux,
+       appearing after configuration reload and then
+       blocking INET socket messages.
+
+       * src/syslogd.c (create_inet_socket): Set SO_REUSEADDR
+       before IPV6_V6ONLY.
+       * tests/syslogd.sh <reloaded configuration>: Remove
+       blocker `user.none' on file `$OUT'.
+
 2013-04-23  Mats Erik Andersson  <address@hidden>
 
        * configure.ac <libidn detection>: Replace by a call
diff --git a/src/syslogd.c b/src/syslogd.c
index c6fcc75..fc633a8 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -920,16 +920,17 @@ create_inet_socket (int af, int fd46[2])
       fd = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol);
       if (fd < 0)
        continue;
+
+      err = setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof (yes));
+      if (err < 0)
+       logerror ("failed to set SO_REUSEADDR");
+
       if (ai->ai_family == AF_INET6)
        {
          /* Avoid dual stacked sockets.  Better to use distinct sockets.  */
          (void) setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof (yes));
        }
 
-      err = setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof (yes));
-      if (err < 0)
-       logerror ("failed to set SO_REUSEADDR");
-
       if (bind (fd, ai->ai_addr, ai->ai_addrlen) < 0)
        {
          close (fd);
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index a1092f2..0614028 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -438,7 +438,7 @@ OUT_DEBUG="$IU_TESTDIR"/debug.log
 : > "$OUT_DEBUG"
 
 cat > "$CONF" <<-EOT
-       *.*;user.none   $OUT
+       *.*             $OUT
        user.info       $OUT_USER
        *.=debug        $OUT_DEBUG
 EOT

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

Summary of changes:
 ChangeLog        |   13 +++++++++++++
 src/syslogd.c    |    9 +++++----
 tests/syslogd.sh |    2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils