[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-50-g31714fe

[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  31714fe8bfeb19bf53502e8a9f503aeba67ad281 (commit)
      from  c590657f6ab2f2df30c0e2087a90ac2afead2af9 (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=31714fe8bfeb19bf53502e8a9f503aeba67ad281


commit 31714fe8bfeb19bf53502e8a9f503aeba67ad281
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Mar 14 16:45:05 2015 +0100

    Build failures while IPv6 is disabled.

diff --git a/ChangeLog b/ChangeLog
index e4da2bd..0310ba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-03-14  Mats Erik Andersson  <address@hidden>
+
+       Build failures while IPv6 is disabled.
+
+       * configure.ac (ENABLE_hstrerror): New conditional variable.
+
+       * src/rlogind.c [IPV6] (checkhost): Move right parenthesis
+       outside of precompiler conditional.
+
+       * telnetd/Makefile.am [ENABLE_hstrerror]: Add $(LIBRESOLV)
+       to LDADD.  With IPv6 disabled, the code in `telnetd/telnetd.c'
+       uses hstrerror(), so Solaris must link against libresolv.
+
 2015-02-28  Mats Erik Andersson  <address@hidden>
 
        Fully configure testing without IPv6.
diff --git a/configure.ac b/configure.ac
index 3579817..b1ba09b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,7 +227,7 @@ fi
 AC_SUBST(LIBLS)
 AC_SUBST(libls_BUILD)
 AC_SUBST(enable_libls)
-AM_CONDITIONAL([ENABLE_libls], test "$enable_libls" = yes)
+AM_CONDITIONAL([ENABLE_libls], [test "$enable_libls" = yes])
 
 # At least OpenSolaris is missing <protocols/talkd.h>.
 AC_CHECK_HEADER(protocols/talkd.h, , ,
@@ -1021,6 +1021,9 @@ esac
 TARGET=${TARGET:-127.0.0.1}
 TARGET6=${TARGET6:-::1}
 
+# Work around code peculiarities.
+AM_CONDITIONAL([ENABLE_hstrerror], [test "$ipv6" = no])
+
 AC_CONFIG_FILES([
 Makefile
 summary.sh
diff --git a/src/rlogind.c b/src/rlogind.c
index 4c6c38e..fb45895 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -333,8 +333,9 @@ check_host (struct sockaddr *sa, socklen_t len)
 
   if (sa->sa_family != AF_INET
 # ifdef IPV6
-      && sa->sa_family != AF_INET6)
+      && sa->sa_family != AF_INET6
 # endif
+     )
     return 1;
 
 # if HAVE_DECL_GETNAMEINFO
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 84abed9..1a927a3 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -31,6 +31,10 @@ LDADD = \
        $(iu_LIBRARIES) \
        $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
 
+if ENABLE_hstrerror
+LDADD += $(LIBRESOLV)
+endif
+
 inetdaemondir = @inetdaemondir@
 
 inetdaemon_PROGRAMS = $(telnetd_BUILD)

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

Summary of changes:
 ChangeLog           |   13 +++++++++++++
 configure.ac        |    5 ++++-
 src/rlogind.c       |    3 ++-
 telnetd/Makefile.am |    4 ++++
 4 files changed, 23 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils