[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-35-g1bf84e8

[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  1bf84e836b2283d1fd783a4e6e5df77a9fe3b4e9 (commit)
      from  6332b5f813bfe72855f5f476699053e22d13b512 (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=1bf84e836b2283d1fd783a4e6e5df77a9fe3b4e9


commit 1bf84e836b2283d1fd783a4e6e5df77a9fe3b4e9
Author: Mats Erik Andersson <address@hidden>
Date:   Mon Feb 20 21:38:29 2012 +0100

    Address resolution and reduced linking.

diff --git a/ChangeLog b/ChangeLog
index bdec92f..f9ebb1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-20  Mats Erik Andersson <address@hidden>
+
+       Improve behaviour of single stacked clients.
+       * ftp/ftp.c (hookup): Do not add AI_ADDRCONFIG to HINTS.ai_flags.
+       * src/logger.c (open_socket): Likewise.
+       * telnet/commands.c (tn): Likewise.
+
+       * telnet/Makefile.am, telnetd/Makefile.am (LDADD): Remove the
+       addition of `$(LIBREADLINE)': not needed.
+
 2012-02-19  Mats Erik Andersson <address@hidden>
 
        * bootstrap.conf (gnulib_modules): Add sethostname to list.
diff --git a/ftp/ftp.c b/ftp/ftp.c
index ee756fb..4f19563 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -136,10 +136,6 @@ hookup (char *host, int port)
   hints.ai_family = usefamily;
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_flags = AI_CANONNAME;
-#ifdef AI_ADDRCONFIG
-  if (hints.ai_family == AF_UNSPEC)
-    hints.ai_flags |= AI_ADDRCONFIG;
-#endif /* AI_ADDRCONFIG */
 
   status = getaddrinfo (host, portstr, &hints, &res);
   if (status)
diff --git a/src/logger.c b/src/logger.c
index 2d3185f..7271f4b 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -206,10 +206,6 @@ open_socket (void)
        * was made with !HAVE_IPV6.  */
       hints.ai_family = host_family;
 
-# ifdef AI_ADDRCONFIG
-      hints.ai_flags = AI_ADDRCONFIG;
-# endif
-
       /* The complete handshake is attempted within
        * a single while-loop, since the answers from
        * getaddrinfo() need to be checked in detail.  */
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index 764f8cd..382f265 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -30,4 +30,4 @@ noinst_HEADERS = defines.h externs.h general.h ring.h types.h
 INCLUDES = $(iu_INCLUDES) $(NCURSES_INCLUDE)
 AM_CPPFLAGS = -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
 
-LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) 
$(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)
+LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) 
$(LIBCRYPT) $(LIBAUTH)
diff --git a/telnet/commands.c b/telnet/commands.c
index aca45ca..e6dec38 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -2555,9 +2555,6 @@ tn (int argc, char *argv[])
     }
 
 #ifdef IPV6
-# ifdef AI_ADDRCONFIG
-  hints.ai_flags = AI_ADDRCONFIG;
-# endif
   hints.ai_socktype = SOCK_STREAM;
 
   err = getaddrinfo (hostp, portp, &hints, &result);
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index cbbf640..7fce7ba 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -32,4 +32,4 @@ noinst_HEADERS = telnetd.h
 AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
 INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH) $(NCURSES_INCLUDE)
 
-LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) 
$(LIBUTIL) $(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)
+LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) 
$(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)

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

Summary of changes:
 ChangeLog           |   10 ++++++++++
 ftp/ftp.c           |    4 ----
 src/logger.c        |    4 ----
 telnet/Makefile.am  |    2 +-
 telnet/commands.c   |    3 ---
 telnetd/Makefile.am |    2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU Inetutils