[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-66-gfb27938

[Alfred M. Szmidt]

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  fb27938e459a824d09f648bfa05ca3dad5f4cd02 (commit)
       via  909da54e827d2f882db54dcb3b33a02f0db1bb10 (commit)
       via  773115a7d7d3627632c2d58a1466c876411c0ad4 (commit)
      from  45fc01f25fee6aebb6eddc42576ab00212778da3 (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=fb27938e459a824d09f648bfa05ca3dad5f4cd02


commit fb27938e459a824d09f648bfa05ca3dad5f4cd02
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Mar 29 21:45:51 2012 +0200

    tests/.gitignore: Added tools.sh to list.

diff --git a/ChangeLog b/ChangeLog
index 0ef61de..69375b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-29  Alfred M. Szmidt  <address@hidden>
 
+       * tests/.gitignore: Added tools.sh to list.
+
+2012-03-29  Alfred M. Szmidt  <address@hidden>
+
        Create xz compressed tarballs as part of `make dist'.
 
        * README-alpha: Updated.
diff --git a/tests/.gitignore b/tests/.gitignore
index eb2c542..51bb74c 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,2 +1,3 @@
 localhost
 addrpeek
+tools.sh

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


commit 909da54e827d2f882db54dcb3b33a02f0db1bb10
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Mar 29 21:43:47 2012 +0200

    Create xz compressed tarballs as part of `make dist'.

diff --git a/.gitignore b/.gitignore
index f63795b..5ed6df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ gnulib
 gnulib/
 include
 inetutils-*.tar.gz
+inetutils-*.tar.xz
 inetutils-*/
 lib/
 libtool
diff --git a/ChangeLog b/ChangeLog
index 8565312..0ef61de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-29  Alfred M. Szmidt  <address@hidden>
+
+       Create xz compressed tarballs as part of `make dist'.
+
+       * README-alpha: Updated.
+       * configure.ac: Added dist-xz.
+       * .gitignore: Added inetutils-*.tar.xz to list.
+
 2012-03-27  Alfred M. Szmidt  <address@hidden>
 
        Check return code of malloc, or use xmalloc.
diff --git a/README-alpha b/README-alpha
index 16eedf1..5f8883d 100644
--- a/README-alpha
+++ b/README-alpha
@@ -134,10 +134,10 @@ FIXME: put recent NEWS items here
 Please send bug reports to address@hidden
 
 Here are the compressed sources:
-  ftp://ftp.gnu.org/gnu/inetutils/inetutils-VERSION.tar.gz
+  ftp://ftp.gnu.org/gnu/inetutils/inetutils-VERSION.tar.xz
 
 Here are the GPG detached signatures[*]:
-  ftp://ftp.gnu.org/gnu/inetutils/inetutils-VERSION.tar.gz.sig
+  ftp://ftp.gnu.org/gnu/inetutils/inetutils-VERSION.tar.xz.sig
 
 To reduce load on the main server, use a mirror listed at:
   http://www.gnu.org/order/ftp.html
@@ -147,7 +147,7 @@ the corresponding file (without the .sig suffix) is intact. 
 First,
 be sure to download both the .sig file and the corresponding tarball.
 Then, run a command like this:
 
-  gpg --verify inetutils-VERSION.tar.gz.sig
+  gpg --verify inetutils-VERSION.tar.xz.sig
 
 If that command fails because you don't have the required public key,
 then run this command to import it:
diff --git a/configure.ac b/configure.ac
index 468a5a4..3b3258d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADER([config.h:config.hin])
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.11.1])
+AM_INIT_AUTOMAKE([1.11.1 dist-xz])
 
 # config.h turns this on, so make sure it's on for our tests too
 #CPPFLAGS=-D_BSD_SOURCE

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


commit 773115a7d7d3627632c2d58a1466c876411c0ad4
Author: Alfred M. Szmidt <address@hidden>
Date:   Tue Mar 27 08:54:55 2012 +0200

    Check return code of malloc, or use xmalloc.

diff --git a/ChangeLog b/ChangeLog
index d6ea7c5..8565312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2012-03-27  Alfred M. Szmidt  <address@hidden>
+
+       Check return code of malloc, or use xmalloc.
+
+       * whois/whois.c: Include "xalloc.h".
+       (gwhois_argp_parser, queryformat): Use xmalloc over malloc.
+
+       * telnet/commands.c: Include "xalloc.h".
+       (env_init, env_define): Use xmalloc over malloc.
+
+       * src/syslogd.c: Include "xalloc.h".
+       (crunch_list): Use xmalloc over malloc.
+
+       * src/rshd.c: Include "xalloc.h".
+       (doit): Use xmalloc over malloc.
+
+       * src/rsh.c: Include "xalloc.h".
+       (main): Use xmalloc over malloc.
+
+       * src/rlogind.c: Include "xalloc.h".
+       (do_shishi_login): Use xmalloc over malloc.
+
+       * src/rlogin.c: Include "xalloc.h".
+       (main): Use xmalloc over malloc.
+
+       * libtelnet/shishi.c (krb5shishi_send): Check return code of
+       malloc.
+
+       * libtelnet/kerberos5.c (kerberos5_send): Don't use assert to
+       check the return code for malloc
+
+       * libinetutils/kcmd.c (kcmd): Check return code of malloc.
+
+       * ifconfig/printif.c: Include "xalloc.h".
+       (print_interfaceX): Use xmalloc over malloc.
+
+       * ftp/cmds.c: Include "xalloc.h".
+       (dotrans, domap): Use xmalloc over malloc.
+
 2012-03-21  Mats Erik Andersson  <address@hidden>
 
        * configure.ac (DD, MKTEMP, NETSTAT): New variables.  Use AC_PATH_PROG
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 07a8252..0fee735 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -82,6 +82,7 @@
 
 #include "ftp_var.h"
 #include "unused-parameter.h"
+#include "xalloc.h"
 
 #ifndef DEFPORT
 # ifdef IPPORT_FTP
@@ -2076,7 +2077,7 @@ setntrans (int argc, char **argv)
 char *
 dotrans (char *name)
 {
-  char *new = malloc (strlen (name) + 1);
+  char *new = xmalloc (strlen (name) + 1);
   char *cp1, *cp2 = new;
   int i, ostop, found;
 
@@ -2191,7 +2192,7 @@ char *
 domap (char *name)
 {
   int buf_len = strlen (name) + 1;
-  char *buf = malloc (buf_len);
+  char *buf = xmalloc (buf_len);
   char *cp1 = name, *cp2 = mapin;
   char *tp[9], *te[9];
   int i, toks[9], toknum = 0, match = 1;
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 19cb290..5bd93b7 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -46,6 +46,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include "ifconfig.h"
+#include "xalloc.h"
 
 FILE *ostream;                 /* Either stdout or stderror.  */
 int column_stdout;             /* The column position of the cursor on stdout. 
 */
@@ -1044,7 +1045,7 @@ print_interfaceX (format_data_t form, int quiet)
                  form->format = p;
                  print_interfaceX (form, 1);
                  q = form->format;
-                 argv[argc] = malloc (q - p + 1);
+                 argv[argc] = xmalloc (q - p + 1);
                  memcpy (argv[argc], p, q - p);
                  argv[argc][q - p] = '\0';
                  if (*q == '}')
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 04d1687..2e7846c 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -137,6 +137,8 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short 
rport, char *locuser,
     }
 
   host_save = malloc (strlen (hp->h_name) + 1);
+  if (host_save == NULL)
+    return -1;
   strcpy (host_save, hp->h_name);
   *ahost = host_save;
 
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index ed71a26..3649c0c 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -230,7 +230,11 @@ kerberos5_send (TN_Authenticator * ap)
 
       rdata.length = strlen (telnet_krb5_realm);
       rdata.data = malloc (rdata.length + 1);
-      assert (rdata.data);
+      if (rdata.data == NULL)
+       {
+         DEBUG (("telnet: Kerberos V5: could not allocate memory\r\n"));
+         return 0;
+       }
       strcpy (rdata.data, telnet_krb5_realm);
       krb5_princ_set_realm (telnet_context, creds.server, &rdata);
     }
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index 4bf70c1..dd1622a 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -160,6 +160,11 @@ krb5shishi_send (TN_Authenticator * ap)
     }
 
   tmp = malloc (strlen ("host/") + strlen (RemoteHostName) + 1);
+  if (tmp == NULL)
+    {
+      DEBUG (("telnet: Kerberos V5: shishi memory allocation failed\r\n"));
+      return 0;
+    }
   sprintf (tmp, "host/%s", RemoteHostName);
   memset (&hint, 0, sizeof (hint));
   hint.server = tmp;
diff --git a/src/rlogin.c b/src/rlogin.c
index aadf4eb..2e5c5ba 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -103,6 +103,7 @@
 #include <progname.h>
 #include "libinetutils.h"
 #include "unused-parameter.h"
+#include "xalloc.h"
 
 #ifdef KERBEROS
 # ifdef HAVE_KERBEROSIV_DES_H
@@ -483,7 +484,7 @@ try_connect:
                    case SHISHI_DES_CBC_NONE:
                    case SHISHI_DES3_CBC_HMAC_SHA1_KD:
                      ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
-                     ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+                     ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
                      memset (ivtab[i]->iv, !i, ivtab[i]->ivlen);
                      ivtab[i]->ctx =
                        shishi_crypto (handle, key, ivtab[i]->keyusage,
@@ -501,7 +502,7 @@ try_connect:
                    default:
                      ivtab[i]->keyusage =
                        SHISHI_KEYUSAGE_KCMD_DES + 2 + 4 * i;
-                     ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+                     ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
                      memset (ivtab[i]->iv, 0, ivtab[i]->ivlen);
                      ivtab[i]->ctx =
                        shishi_crypto (handle, key, ivtab[i]->keyusage,
diff --git a/src/rlogind.c b/src/rlogind.c
index 663da5b..48f1bdc 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -70,6 +70,7 @@
 #include <argp.h>
 #include <libinetutils.h>
 #include "unused-parameter.h"
+#include "xalloc.h"
 
 /*
   The TIOCPKT_* macros may not be implemented in the pty driver.
@@ -1148,7 +1149,7 @@ do_shishi_login (int infd, struct auth_data *ad, const 
char **err_msg)
            case SHISHI_DES_CBC_NONE:
            case SHISHI_DES3_CBC_HMAC_SHA1_KD:
              ad->ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
-             ad->ivtab[i]->iv = malloc (ad->ivtab[i]->ivlen);
+             ad->ivtab[i]->iv = xmalloc (ad->ivtab[i]->ivlen);
              memset (ad->ivtab[i]->iv, i, ad->ivtab[i]->ivlen);
              ad->ivtab[i]->ctx =
                shishi_crypto (ad->h, ad->enckey, ad->ivtab[i]->keyusage,
@@ -1164,7 +1165,7 @@ do_shishi_login (int infd, struct auth_data *ad, const 
char **err_msg)
              break;
            default:
              ad->ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES + 6 - 4 * i;
-             ad->ivtab[i]->iv = malloc (ad->ivtab[i]->ivlen);
+             ad->ivtab[i]->iv = xmalloc (ad->ivtab[i]->ivlen);
              memset (ad->ivtab[i]->iv, 0, ad->ivtab[i]->ivlen);
              if (ad->protocol == 2)
                ad->ivtab[i]->ctx =
diff --git a/src/rsh.c b/src/rsh.c
index 6f57c96..d7d164a 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -77,6 +77,7 @@
 #include <xalloc.h>
 #include <argp.h>
 #include <libinetutils.h>
+#include "xalloc.h"
 
 #ifdef KERBEROS
 # ifdef HAVE_KERBEROSIV_DES_H
@@ -381,7 +382,7 @@ try_connect:
                    case SHISHI_DES_CBC_NONE:
                    case SHISHI_DES3_CBC_HMAC_SHA1_KD:
                      ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
-                     ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+                     ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
                      memset (ivtab[i]->iv,
                              2 * i + 1 * (i < 2) - 4 * (i >= 2),
                              ivtab[i]->ivlen);
@@ -401,7 +402,7 @@ try_connect:
                    default:
                      ivtab[i]->keyusage =
                        SHISHI_KEYUSAGE_KCMD_DES + 2 + 4 * i;
-                     ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+                     ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
                      memset (ivtab[i]->iv, 0, ivtab[i]->ivlen);
                      ivtab[i]->ctx =
                        shishi_crypto (h, enckey, ivtab[i]->keyusage,
diff --git a/src/rshd.c b/src/rshd.c
index a9d25c8..e5df05f 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -96,6 +96,7 @@
 #include <progname.h>
 #include <argp.h>
 #include <libinetutils.h>
+#include "xalloc.h"
 
 #ifdef KERBEROS
 # ifdef HAVE_KERBEROSIV_DES_H
@@ -684,7 +685,7 @@ doit (int sockfd, struct sockaddr_in *fromp)
                case SHISHI_DES_CBC_NONE:
                case SHISHI_DES3_CBC_HMAC_SHA1_KD:
                  ivtab[i]->keyusage = SHISHI_KEYUSAGE_KCMD_DES;
-                 ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+                 ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
                  memset (ivtab[i]->iv, 2 * i - 3 * (i >= 2),
                          ivtab[i]->ivlen);
                  ivtab[i]->ctx =
@@ -705,7 +706,7 @@ doit (int sockfd, struct sockaddr_in *fromp)
                default:
                  ivtab[i]->keyusage =
                    SHISHI_KEYUSAGE_KCMD_DES + 4 * (i < 2) + 2 + 2 * (i % 2);
-                 ivtab[i]->iv = malloc (ivtab[i]->ivlen);
+                 ivtab[i]->iv = xmalloc (ivtab[i]->ivlen);
                  memset (ivtab[i]->iv, 0, ivtab[i]->ivlen);
                  if (protocol == 2)
                    ivtab[i]->ctx =
diff --git a/src/syslogd.c b/src/syslogd.c
index a5b7e0b..f96ee85 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -124,6 +124,7 @@
 #include <libinetutils.h>
 #include <readutmp.h>
 #include "unused-parameter.h"
+#include "xalloc.h"
 
 /* A mask of all facilities mentioned explicitly in the configuration file
  *
@@ -970,7 +971,7 @@ crunch_list (char **oldlist, char *list)
     }
 
   /* take the last one */
-  oldlist[count] = (char *) malloc ((strlen (p) + 1) * sizeof (char));
+  oldlist[count] = (char *) xmalloc ((strlen (p) + 1) * sizeof (char));
   if (oldlist[count] == NULL)
     error (EXIT_FAILURE, errno, "can't allocate memory");
 
diff --git a/telnet/commands.c b/telnet/commands.c
index e6dec38..6a1be36 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -85,6 +85,7 @@
 
 #include "xalloc.h"
 #include "xvasprintf.h"
+#include "xalloc.h"
 
 #ifdef ENCRYPTION
 # include <libtelnet/encrypt.h>
@@ -1895,7 +1896,7 @@ env_init (void)
       char *hostname = localhost ();
       char *cp2 = strchr ((char *) ep->value, ':');
 
-      cp = malloc (strlen (hostname) + strlen (cp2) + 1);
+      cp = xmalloc (strlen (hostname) + strlen (cp2) + 1);
       sprintf (cp, "%s%s", hostname, cp2);
 
       free (ep->value);
@@ -1928,7 +1929,7 @@ env_define (const char *var, unsigned char *value)
     }
   else
     {
-      ep = (struct env_lst *) malloc (sizeof (struct env_lst));
+      ep = (struct env_lst *) xmalloc (sizeof (struct env_lst));
       ep->next = envlisthead.next;
       envlisthead.next = ep;
       ep->prev = &envlisthead;
diff --git a/whois/whois.c b/whois/whois.c
index 9960773..07e1f7d 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -45,6 +45,7 @@
 /* Application-specific */
 #include <data.h>
 #include <whois.h>
+#include "xalloc.h"
 
 /* Global variables */
 int sockfd, verb = 0;
@@ -138,7 +139,7 @@ gwhois_argp_parser (int key, char *arg, struct argp_state 
*state)
   switch (key)
     {
     case 'h':
-      server = q = malloc (strlen (arg) + 1);
+      server = q = xmalloc (strlen (arg) + 1);
       for (p = arg; *p != '\0' && *p != ':'; *q++ = tolower (*p++));
       if (*p == ':')
        port = p + 1;
@@ -410,7 +411,7 @@ queryformat (const char *server, const char *flags, const 
char *query)
   int isripe = 0;
 
   /* +10 for CORE; +2 for \r\n; +1 for NULL */
-  buf = malloc (strlen (flags) + strlen (query) + 10 + 2 + 1);
+  buf = xmalloc (strlen (flags) + strlen (query) + 10 + 2 + 1);
   *buf = '\0';
 
   isripe = is_ripe_server (ripe_servers, server)
@@ -521,7 +522,7 @@ query_crsnic (const int sock, const char *query)
   char *temp, buf[100], *ret = NULL;
   FILE *fi;
 
-  temp = malloc (strlen (query) + 1 + 2 + 1);
+  temp = xmalloc (strlen (query) + 1 + 2 + 1);
   *temp = '=';
   strcpy (temp + 1, query);
   strcat (temp, "\r\n");
@@ -539,7 +540,7 @@ query_crsnic (const int sock, const char *query)
 
          for (p = buf; *p != ':'; p++);        /* skip until colon */
          for (p++; *p == ' '; p++);    /* skip colon and spaces */
-         ret = malloc (strlen (p) + 1);
+         ret = xmalloc (strlen (p) + 1);
          for (q = ret; *p != '\n' && *p != '\r'; *q++ = *p++); /*copy data */
          *q = '\0';
        }

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

Summary of changes:
 .gitignore            |    1 +
 ChangeLog             |   51 +++++++++++++++++++++++++++++++++++++++++++++++++
 README-alpha          |    6 ++--
 configure.ac          |    2 +-
 ftp/cmds.c            |    5 ++-
 ifconfig/printif.c    |    3 +-
 libinetutils/kcmd.c   |    2 +
 libtelnet/kerberos5.c |    6 ++++-
 libtelnet/shishi.c    |    5 ++++
 src/rlogin.c          |    5 ++-
 src/rlogind.c         |    5 ++-
 src/rsh.c             |    5 ++-
 src/rshd.c            |    5 ++-
 src/syslogd.c         |    3 +-
 telnet/commands.c     |    5 ++-
 tests/.gitignore      |    1 +
 whois/whois.c         |    9 ++++---
 17 files changed, 96 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
GNU Inetutils