[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_4-86-g4747b63

[Tim Ruehsen]

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  4747b63d70d4c4102839282ba4437233fb18af08 (commit)
       via  d2f3c2e365865917fb9b7ff4d1ceafc33a31bca7 (commit)
       via  5d06b6ebea090f9d6b2517d028a5f0b7fe64ff3a (commit)
       via  46def330241ae6b80590e869ce255c615942d73f (commit)
       via  4114b424a8025a447deb65f57a5b15ea5a523c76 (commit)
       via  14291eccccbf0f10b234bcab8ca5eefe7ebbebc7 (commit)
       via  861ee754da65e1e7a2a6168eb90e9c5f0a53a9d5 (commit)
      from  a9d1edfd4701b590a9519498ef5514492520be76 (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=4747b63d70d4c4102839282ba4437233fb18af08


commit 4747b63d70d4c4102839282ba4437233fb18af08
Author: Tim Rühsen <address@hidden>
Date:   Mon Feb 17 21:40:22 2020 +0100

    ping6: Fix memleak in ping_set_dest

diff --git a/ping/ping6.c b/ping/ping6.c
index 1ae5e44..2d14a4e 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -997,7 +997,7 @@ ping_recv (PING * p)
 }
 
 static int
-ping_set_dest (PING * ping, char *host)
+ping_set_dest (PING * ping, const char *host)
 {
   int err;
   struct addrinfo *result, hints;
@@ -1007,8 +1007,9 @@ ping_set_dest (PING * ping, char *host)
   err = idna_to_ascii_lz (host, &rhost, 0);
   if (err)
     return 1;
+  host = rhost;
 #else /* !HAVE_IDN */
-  rhost = host;
+  rhost = NULL;
 #endif
 
   memset (&hints, 0, sizeof (hints));
@@ -1021,19 +1022,22 @@ ping_set_dest (PING * ping, char *host)
   hints.ai_flags |= AI_CANONIDN;
 #endif
 
-  err = getaddrinfo (rhost, NULL, &hints, &result);
+  err = getaddrinfo (host, NULL, &hints, &result);
   if (err)
-    return 1;
+    {
+      free (rhost);
+      return 1;
+    }
 
   memcpy (&ping->ping_dest.ping_sockaddr6, result->ai_addr, 
result->ai_addrlen);
 
   if (result->ai_canonname)
     ping->ping_hostname = strdup (result->ai_canonname);
   else
-    ping->ping_hostname = strdup (rhost);
-
 #if HAVE_IDN
-  free (rhost);
+    ping->ping_hostname = host;
+#else
+  ping->ping_hostname = strdup (host);
 #endif
   freeaddrinfo (result);
 
diff --git a/ping/ping6.h b/ping/ping6.h
index c0606f8..9eb0c92 100644
--- a/ping/ping6.h
+++ b/ping/ping6.h
@@ -23,7 +23,7 @@
 #define USE_IPV6 1
 
 static PING *ping_init (int type, int ident);
-static int ping_set_dest (PING * ping, char *host);
+static int ping_set_dest (PING * ping, const char *host);
 static int ping_recv (PING * p);
 static int ping_xmit (PING * p);
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=d2f3c2e365865917fb9b7ff4d1ceafc33a31bca7


commit d2f3c2e365865917fb9b7ff4d1ceafc33a31bca7
Author: Tim Rühsen <address@hidden>
Date:   Mon Feb 17 21:39:20 2020 +0100

    ping: Fix memleak in ping_set_packetsize

diff --git a/ping/libping.c b/ping/libping.c
index 00d0652..d771d34 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -286,19 +286,20 @@ ping_set_packetsize (PING * ping, size_t size)
 }
 
 int
-ping_set_dest (PING * ping, char *host)
+ping_set_dest (PING * ping, const char *host)
 {
 #if HAVE_DECL_GETADDRINFO
   int rc;
   struct addrinfo hints, *res;
-  char *p;
+  char *rhost;
 
 # ifdef HAVE_IDN
-  rc = idna_to_ascii_lz (host, &p, 0); /* P is allocated.  */
+  rc = idna_to_ascii_lz (host, &rhost, 0);     /* P is allocated.  */
   if (rc)
     return 1;
-# else /* !HAVE_IDN */
-  p = host;
+  host = rhost;
+#else
+  rhost = NULL;
 # endif
 
   memset (&hints, 0, sizeof (hints));
@@ -311,20 +312,24 @@ ping_set_dest (PING * ping, char *host)
   hints.ai_flags |= AI_CANONIDN;
 # endif
 
-  rc = getaddrinfo (p, NULL, &hints, &res);
+  rc = getaddrinfo (host, NULL, &hints, &res);
 
   if (rc)
-    return 1;
+    {
+      free (rhost);
+      return 1;
+    }
 
   memcpy (&ping->ping_dest.ping_sockaddr, res->ai_addr, res->ai_addrlen);
   if (res->ai_canonname)
     ping->ping_hostname = strdup (res->ai_canonname);
   else
-    ping->ping_hostname = strdup (p);
-
 # ifdef HAVE_IDN
-  free (p);
+    ping->ping_hostname = host;
+#else
+    ping->ping_hostname = strdup (host);
 # endif
+
   freeaddrinfo (res);
 
   return 0;
@@ -341,14 +346,14 @@ ping_set_dest (PING * ping, char *host)
     {
       struct hostent *hp;
 # ifdef HAVE_IDN
-      char *p;
+      char *rhost;
       int rc;
 
-      rc = idna_to_ascii_lz (host, &p, 0);
+      rc = idna_to_ascii_lz (host, &rhost, 0);
       if (rc)
        return 1;
-      hp = gethostbyname (p);
-      free (p);
+      hp = gethostbyname (rhost);
+      free (rhost);
 # else /* !HAVE_IDN */
       hp = gethostbyname (host);
 # endif
diff --git a/ping/ping.h b/ping/ping.h
index c6aafab..03b0c74 100644
--- a/ping/ping.h
+++ b/ping/ping.h
@@ -24,7 +24,7 @@ PING *ping_init (int type, int ident);
 void ping_reset (PING * p);
 void ping_set_type (PING * p, int type);
 void ping_set_packetsize (PING * ping, size_t size);
-int ping_set_dest (PING * ping, char *host);
+int ping_set_dest (PING * ping, const char *host);
 int ping_set_pattern (PING * p, int len, unsigned char * pat);
 void ping_set_event_handler (PING * ping, ping_efp fp, void *closure);
 int ping_recv (PING * p);

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=5d06b6ebea090f9d6b2517d028a5f0b7fe64ff3a


commit 5d06b6ebea090f9d6b2517d028a5f0b7fe64ff3a
Author: Tim Rühsen <address@hidden>
Date:   Sun Feb 16 20:16:31 2020 +0100

    libls: Remove unused variable kflag

diff --git a/libls/ls.c b/libls/ls.c
index 1af03be..3ca13de 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -119,7 +119,6 @@ ls_main (int argc, char **argv)
   static char dot[] = ".", *dotav[] = { dot, NULL };
   struct winsize win;
   int ch, fts_options;
-  int kflag = 0;
   char *p;
 
   /*
@@ -227,7 +226,6 @@ ls_main (int argc, char **argv)
          break;
        case 'k':
          blocksize = 1024;
-         kflag = 1;
          break;
        case 'o':
          f_flags = 1;

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=46def330241ae6b80590e869ce255c615942d73f


commit 46def330241ae6b80590e869ce255c615942d73f
Author: Tim Rühsen <address@hidden>
Date:   Sun Feb 16 19:54:30 2020 +0100

    ftpd: Fix multiple definition of 'errcatch' (gcc 10)

diff --git a/ftpd/extern.h b/ftpd/extern.h
index 50e16ed..3e2200f 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -88,7 +88,7 @@ extern void user (const char *);
 extern char *sgetsave (const char *);
 
 /* Exported from ftpd.c.  */
-jmp_buf errcatch;
+extern jmp_buf errcatch;
 extern struct sockaddr_storage data_dest;
 extern socklen_t data_dest_len;
 extern struct sockaddr_storage his_addr;
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 08ff522..7af1dc5 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -144,6 +144,8 @@ char portstr[8];            /* Numeric port as string.  */
 /* Requester credentials.  */
 struct credentials cred;
 
+jmp_buf errcatch;
+
 static struct sockaddr_storage ctrl_addr;      /* Control address.  */
 static socklen_t ctrl_addrlen;
 static struct sockaddr_storage data_source;    /* Port address.  */

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=4114b424a8025a447deb65f57a5b15ea5a523c76


commit 4114b424a8025a447deb65f57a5b15ea5a523c76
Author: Tim Rühsen <address@hidden>
Date:   Sun Feb 16 19:42:05 2020 +0100

    telnetd: Fix multiple definition of 'not42' (gcc 10)

diff --git a/telnetd/utility.c b/telnetd/utility.c
index 42f624e..fe40e3b 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -63,7 +63,7 @@ static int ncc;
 static char ptyibuf[BUFSIZ], *ptyip;
 static int pcc;
 
-int not42;
+extern int not42;
 
 static int
 readstream (int p, char *ibuf, int bufsize)

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=14291eccccbf0f10b234bcab8ca5eefe7ebbebc7


commit 14291eccccbf0f10b234bcab8ca5eefe7ebbebc7
Author: Tim Rühsen <address@hidden>
Date:   Sun Feb 16 19:38:07 2020 +0100

    rcp: Remove unused variable

diff --git a/src/rcp.c b/src/rcp.c
index 4cfdeaf..33f33ee 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -566,7 +566,7 @@ toremote (char *targ, int argc, char *argv[])
 void
 tolocal (int argc, char *argv[])
 {
-  int i, len, tos;
+  int i, tos;
   char *bp, *host, *src, *suser, *vect[1];
 #if defined IP_TOS && defined IPPROTO_IP && defined IPTOS_THROUGHPUT
   struct sockaddr_storage ss;
@@ -578,8 +578,6 @@ tolocal (int argc, char *argv[])
       src = colon (argv[i]);
       if (!src)
        {                       /* Local to local. */
-         len = strlen (PATH_CP) + strlen (argv[i]) +
-               strlen (target) + 20;
          if (asprintf (&bp, "exec %s%s%s %s %s",
                        PATH_CP,
                        iamrecursive ? " -R" : "",

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=861ee754da65e1e7a2a6168eb90e9c5f0a53a9d5


commit 861ee754da65e1e7a2a6168eb90e9c5f0a53a9d5
Author: Tim Rühsen <address@hidden>
Date:   Sun Feb 16 19:15:45 2020 +0100

    telnet: Fix silent truncation (off-by-one check)
    
    If the DISPLAY variable had exactly 44 bytes, the SE
    byte (end sub negotiation) was silently truncated.

diff --git a/telnet/telnet.c b/telnet/telnet.c
index 297ae0e..d5d13c1 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -1010,7 +1010,7 @@ suboption (void)
           * protocol must remain unsevered.  Check that DP fits in
           * full within TEMP.  Otherwise report buffer error.
           */
-         if (strlen (dp) > sizeof (temp) - 4 - 2)
+         if (strlen ((char *) dp) >= sizeof (temp) - 4 - 2)
            {
              printf ("lm_will: not enough room in buffer\n");
              break;

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

Summary of changes:
 ftpd/extern.h     |  2 +-
 ftpd/ftpd.c       |  2 ++
 libls/ls.c        |  2 --
 ping/libping.c    | 33 +++++++++++++++++++--------------
 ping/ping.h       |  2 +-
 ping/ping6.c      | 18 +++++++++++-------
 ping/ping6.h      |  2 +-
 src/rcp.c         |  4 +---
 telnet/telnet.c   |  2 +-
 telnetd/utility.c |  2 +-
 10 files changed, 38 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
GNU Inetutils