[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-223-g3d9eadf

[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  3d9eadf7d2e1325cb42fdee7d875b675403304a8 (commit)
      from  67b49c54c0304942737f5409ec4e0c0435443114 (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=3d9eadf7d2e1325cb42fdee7d875b675403304a8


commit 3d9eadf7d2e1325cb42fdee7d875b675403304a8
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Dec 7 14:25:10 2012 +0100

    Activate servers for FreeBSD 9.
    
    Remove inhibition of ftpd, rlogind, telnetd,
    and uucpd.  They seem to work sufficiently well.

diff --git a/ChangeLog b/ChangeLog
index f1caf37..a2ae553 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2012-12-07  Mats Erik Andersson  <address@hidden>
 
+       Activate servers in FreeBSD 9 and 10.  They work
+       sufficiently well with the previous adaptions.
+
+       * configure.ac <*-freebsd9* || *-freebsd10*>:
+       Delete inhibition of ftpd, rlogind, telnetd, and uucpd.
+
+       Mixed compilation warnings.
+
+       * ftp/cmdtab.c (help): Cast strlen() as int.
+       * libls/ls.c (display): MAXBLOCK is portably `long'.
+       * src/rlogind.c (protocol): Make NFD an unsigned int.
+       * telnet/sys_bsd.c (ayt) [SIGINFO]: Mark `sig' as unused.
+       * telnet/telnet.c (init_term): Declare static.  Delete
+       unused parameter `fd'.  Rewrite numerical end of TERMBUF.
+       (gettermname): Update call to init_term().
+       (lm_will, lm_do, lm_mode, slc_import): Cast sizeof()
+       as int when comparing to NETROOM.
+       (telnet) [!AUTHENTICATION && !ENCRYPTION]: Trivially
+       use parameter `user'.
+
+2012-12-07  Mats Erik Andersson  <address@hidden>
+
        Keep track of allocations.  Was an unlimited use of malloc()!
 
        * src/rcp.c (sink): Change CURSIZE to size_t.  Initialize
diff --git a/configure.ac b/configure.ac
index c94e996..e793c00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -960,11 +960,11 @@ case "$host" in
   # FreeBSD 9.0 has implemented a non-standard and singular
   # UTMPX interface.  The readutmp module from GNUlib does
   # not support it, but we can fall back to getutxuser() for
-  # use in syslogd and talkd.
-  IU_DISABLE_TARGET(ftpd)
-  IU_DISABLE_TARGET(rlogind)
-  IU_DISABLE_TARGET(telnetd)
-  IU_DISABLE_TARGET(uucpd)
+  # use in syslogd and talkd.  For ftpd, rlogind, telnetd,
+  # and uucpd the use of pututxent() should suffice, but
+  # this needs continued observations.
+  #
+  # Other issues?
   ;;
 *olaris*)
   AC_DEFINE([SOLARIS], 1, [FIXME])
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index 0905ea7..6615ee8 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -284,7 +284,7 @@ help (int argc, char *argv[])
                }
              else if (c->c_name)
                {
-                 for (k = 0; k < strlen (c->c_name); k++)
+                 for (k = 0; k < (int) strlen (c->c_name); k++)
                    putchar (' ');
                }
              if (c + lines >= &cmdtab[NCMDS])
diff --git a/libls/ls.c b/libls/ls.c
index 481f76f..0444417 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -426,7 +426,8 @@ display (FTSENT *p, FTSENT *list)
   FTSENT *cur;
   NAMES *np;
   unsigned long long maxsize;
-  unsigned long btotal, maxblock, maxinode, maxlen, maxnlink;
+  unsigned long btotal, maxinode, maxlen, maxnlink;
+  long maxblock;
   int bcfile, flen, glen, ulen, maxflags, maxgroup, maxuser;
   int entries, needstats;
   char *user = NULL, *group = NULL, buf[INT_BUFSIZE_BOUND (uintmax_t)];
diff --git a/src/rlogind.c b/src/rlogind.c
index 2a5428e..04a1721 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1698,7 +1698,8 @@ protocol (int f, int p, struct auth_data *ap)
 {
   char fibuf[BUFLEN], *pbp = NULL, *fbp = NULL;
   int pcc = 0, fcc = 0;
-  int cc, nfd, n;
+  int cc, n;
+  unsigned int nfd;
   char cntl;
 
 #ifndef SHISHI
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index eb610d1..af21a90 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1000,7 +1000,7 @@ sendwin (int sig _GL_UNUSED_PARAMETER)
 
 #ifdef SIGINFO
 void
-ayt (int sig)
+ayt (int sig _GL_UNUSED_PARAMETER)
 {
   if (connected)
     sendayt ();
diff --git a/telnet/telnet.c b/telnet/telnet.c
index b5e4b64..ab1cb99 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -736,8 +736,8 @@ mklist (char *buf, char *name)
 
 char termbuf[1024];
 
-int
-init_term (char *tname, int fd, int *errp)
+static int
+init_term (char *tname, int *errp)
 {
   int err = -1;
 #ifdef HAVE_TGETENT
@@ -745,7 +745,7 @@ init_term (char *tname, int fd, int *errp)
 #endif
   if (err == 1)
     {
-      termbuf[1023] = '\0';
+      termbuf[sizeof (termbuf) - 1] = '\0';
       if (errp)
        *errp = 1;
       return (0);
@@ -771,7 +771,7 @@ gettermname (void)
       if (tnamep && tnamep != unknown)
        free (tnamep);
       if ((tname = (char *) env_getvalue ("TERM")) &&
-         (init_term (tname, 1, &err) == 0))
+         (init_term (tname, &err) == 0))
        {
          tnamep = mklist (termbuf, tname);
        }
@@ -1108,7 +1108,7 @@ lm_will (unsigned char *cmd, int len)
     default:
       str_lm[3] = DONT;
       str_lm[4] = cmd[0];
-      if (NETROOM () > sizeof (str_lm))
+      if (NETROOM () > (int) sizeof (str_lm))
        {
          ring_supply_data (&netoring, str_lm, sizeof (str_lm));
          printsub ('>', &str_lm[2], sizeof (str_lm) - 2);
@@ -1153,7 +1153,7 @@ lm_do (unsigned char *cmd, int len)
     default:
       str_lm[3] = WONT;
       str_lm[4] = cmd[0];
-      if (NETROOM () > sizeof (str_lm))
+      if (NETROOM () > (int) sizeof (str_lm))
        {
          ring_supply_data (&netoring, str_lm, sizeof (str_lm));
          printsub ('>', &str_lm[2], sizeof (str_lm) - 2);
@@ -1200,7 +1200,7 @@ lm_mode (unsigned char *cmd, int len, int init)
   str_lm_mode[4] = linemode;
   if (!init)
     str_lm_mode[4] |= MODE_ACK;
-  if (NETROOM () > sizeof (str_lm_mode))
+  if (NETROOM () > (int) sizeof (str_lm_mode))
     {
       ring_supply_data (&netoring, str_lm_mode, sizeof (str_lm_mode));
       printsub ('>', &str_lm_mode[2], sizeof (str_lm_mode) - 2);
@@ -1328,7 +1328,7 @@ unsigned char slc_import_def[] = {
 void
 slc_import (int def)
 {
-  if (NETROOM () > sizeof (slc_import_val))
+  if (NETROOM () > (int) sizeof (slc_import_val))
     {
       if (def)
        {
@@ -2415,7 +2415,9 @@ telnet (char *user)
     auth_encrypt_init (local_host, hostname, NULL, "TELNET", 0);
     auth_encrypt_user (user);
   }
-#endif /* defined(AUTHENTICATION) || defined(ENCRYPTION)  */
+#else /* !defined(AUTHENTICATION) && !defined(ENCRYPTION)  */
+  (void) user;
+#endif
 #if !defined TN3270
   if (telnetport)
     {

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

Summary of changes:
 ChangeLog        |   22 ++++++++++++++++++++++
 configure.ac     |   10 +++++-----
 ftp/cmdtab.c     |    2 +-
 libls/ls.c       |    3 ++-
 src/rlogind.c    |    3 ++-
 telnet/sys_bsd.c |    2 +-
 telnet/telnet.c  |   20 +++++++++++---------
 7 files changed, 44 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU Inetutils