[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-33-gc7d1ce3

[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  c7d1ce3563946228f9c6d8a18fa4252a199f1bab (commit)
      from  336c4a3056e4ea06496d26f7b328052bed690e19 (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=c7d1ce3563946228f9c6d8a18fa4252a199f1bab


commit c7d1ce3563946228f9c6d8a18fa4252a199f1bab
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Feb 18 00:54:11 2012 +0100

    ftpd: Portability fix.
    
    Recent FreeBSD releases use non-standard getaddrinfo.

diff --git a/ChangeLog b/ChangeLog
index b1fd1e2..9527247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-18  Mats Erik Andersson <address@hidden>
+
+       * README (Notes): Explicitly name extent of Shishi support.
+
+       Portability issue caused by FreeBSD.
+       * ftpd/ftpcmd.y (cmd) <EPRT>: Remove precompiler conditionals
+       using AI_V4MAPPED, keeping code, but do not set AI_V4MAPPED in
+       `hints.ai_flags'.
+
 2012-02-13  Simon Josefsson  <address@hidden>
 
        * README (Notes): Doc fix.
diff --git a/README b/README
index 8be3c52..f5c2588 100644
--- a/README
+++ b/README
@@ -39,6 +39,9 @@ Some known deficiencies:
 
  - Non-Shishi Kerberos support does not build.  Patches welcome.
 
+ - Shishi Kerberos support is only implemented for 'rlogin', 'rlogind',
+   'rsh', 'rshd', 'telnet', and 'telnetd'.
+
  - Not all utilities are Kerberized even when built with Kerberos
    libraries, including 'rcp'.
 
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index e637ac8..dc88350 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -599,10 +599,8 @@ cmd
                                 * currently in use, unless we
                                 * detect IPv4-mapped-to-IPv6.  */
                                if (his_addr.ss_family == $5
-#ifdef AI_V4MAPPED
                                    || ($5 == AF_INET6 && his_addr.ss_family == 
AF_INET)
                                    || ($5 == AF_INET && his_addr.ss_family == 
AF_INET6)
-#endif
                                    ) {
                                        int err;
                                        char p[8];
@@ -614,11 +612,6 @@ cmd
                                        hints.ai_socktype = SOCK_STREAM;
                                        hints.ai_flags = AI_NUMERICHOST | 
AI_NUMERICSERV;
 
-#ifdef AI_V4MAPPED
-                                       if (his_addr.ss_family != $5)
-                                               hints.ai_flags |= AI_V4MAPPED;
-#endif
-
                                        err = getaddrinfo ($7, p, &hints, &res);
                                        if (err)
                                                reply (500, "Illegal EPRT 
Command");
@@ -636,7 +629,6 @@ cmd
                                                             sizeof (struct 
in6_addr)) == 0
                                                  && ntohs (((struct 
sockaddr_in6 *) res->ai_addr)->sin6_port) > IPPORT_RESERVED
                                                 )
-#ifdef AI_V4MAPPED
                                                 ||
                                                 (his_addr.ss_family == AF_INET 
&& res->ai_family == AF_INET6
                                                  && IN6_IS_ADDR_V4MAPPED 
(&((struct sockaddr_in6 *) res->ai_addr)->sin6_addr)
@@ -653,7 +645,6 @@ cmd
                                                             sizeof (struct 
in_addr)) == 0
                                                  && ntohs (((struct 
sockaddr_in *) res->ai_addr)->sin_port) > IPPORT_RESERVED
                                                 )
-#endif /* AI_V4MAPPED */
                                                )
                                        {
                                                /* In the case of IPv4 mapped 
as IPv6,

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

Summary of changes:
 ChangeLog     |    9 +++++++++
 README        |    3 +++
 ftpd/ftpcmd.y |    9 ---------
 3 files changed, 12 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils