[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-296-g0b84551

[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  0b845519d6b1922a34921a1c2fb657e637e7b481 (commit)
      from  4b076100a18fdcf28ed8bc0884dd32c40a918128 (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=0b845519d6b1922a34921a1c2fb657e637e7b481


commit 0b845519d6b1922a34921a1c2fb657e637e7b481
Author: Mats Erik Andersson <address@hidden>
Date:   Wed May 22 18:09:42 2013 +0200

    Mixed compiler warnings.

diff --git a/ChangeLog b/ChangeLog
index 8b8d0a0..d30d523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,41 @@
 2013-05-22  Mats Erik Andersson  <address@hidden>
 
+       libinetutils: Clarify Kerberos dependency.
+
+       * libinetutils/kcmd.c [KERBEROS || SHISHI]:
+       Condition file content on KERBEROS, not KRB4.
+
+
+       Mixed compiler warnings.
+
+       * ftpd/ftpcmd.y (cmd) <EPRT>: Remove the suffix `LL'
+       on constants, which enforces an unwanted cast.
+       (host_port): Likewise.
+
+       * libinetutils/kcmd.c (kcmd): Cast a string length
+       computation as int, used for format precision.
+
+       * libls/print.c (printlong): Cast nlink_t as int.
+
+       * libtelnet/kerberos5.c (Data): Cast CD as `char *'
+       for use by strlen().
+
+       * src/rexecd.c (get_user_password) [!WITH_PAM]:
+       Declare only in absence of WITH_PAM.
+       (doit) [!WITH_PAM]: Declare NAMEP and PW_PASSWORD.
+       (rexec_conv) [WITH_PAM]: Identify `data' as unused.
+       * src/rlogin.c (writer) <!escapechar>: Disambiguate
+       conditional statements inside a braced block.
+       * src/rsh.c: Include <unused-parameter.h>.  Remove
+       inclusion of "xalloc.h".
+       (parse_opt): Identify `state' as unused.
+       * src/rshd.c (doit) [SHISHI]: Declare ERR_MSG as a
+       constant array.
+
+       * telnet/commands.c (tn) [HAVE_IDN]: Declare HOSTTMP.
+
+2013-05-22  Mats Erik Andersson  <address@hidden>
+
        * libtelnet/encrypt.c: Include <unused-parameter.h>.
        (encrypt_start, encrypt_request_start): Mark all
        parameters with _GL_UNUSED_PARAMETER.
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index 085a5bd..bb62c75 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -639,7 +639,7 @@ cmd
                                struct addrinfo hints, *res;
 
                                memset (&hints, 0, sizeof (hints));
-                               snprintf (p, sizeof (p), "%jd", $9 & 0xffffLL);
+                               snprintf (p, sizeof (p), "%jd", $9 & 0xffff);
                                hints.ai_family = $5;
                                hints.ai_socktype = SOCK_STREAM;
                                hints.ai_flags = AI_NUMERICHOST | 
AI_NUMERICSERV;
@@ -909,10 +909,10 @@ host_port
                        struct addrinfo hints, *res;
 
                        snprintf (a, sizeof (a), "%jd.%jd.%jd.%jd",
-                                 $1 & 0xffLL, $3 & 0xffLL,
-                                 $5 & 0xffLL, $7 & 0xffLL);
+                                 $1 & 0xff, $3 & 0xff,
+                                 $5 & 0xff, $7 & 0xff);
                        snprintf (p, sizeof (p), "%jd",
-                                 (($9 & 0xffLL) << 8) + ($11 & 0xffLL));
+                                 (($9 & 0xff) << 8) + ($11 & 0xff));
                        memset (&hints, 0, sizeof (hints));
                        hints.ai_family = his_addr.ss_family;
                        hints.ai_socktype = SOCK_STREAM;
@@ -927,8 +927,8 @@ host_port
 #endif
                            snprintf (a, sizeof (a),
                                      "::ffff:%jd.%jd.%jd.%jd",
-                                     $1 & 0xffLL, $3 & 0xffLL,
-                                     $5 & 0xffLL, $7 & 0xffLL);
+                                     $1 & 0xff, $3 & 0xff,
+                                     $5 & 0xff, $7 & 0xff);
                          }
 
                        err = getaddrinfo (a, p, &hints, &res);
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 325c92b..972cef7 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -49,7 +49,7 @@
 
 #include <config.h>
 
-#if defined KRB4 || defined SHISHI
+#if defined KERBEROS || defined SHISHI
 
 # include <sys/param.h>
 # include <sys/file.h>
@@ -208,7 +208,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short 
rport, char *locuser,
        * and concatenate the host's canonical name, but
        * preceeded by a slash.
        */
-      sprintf (p, "%.*s/%s", host - *ahost - 1, *ahost, host_save);
+      sprintf (p, "%.*s/%s", (int) (host - *ahost - 1), *ahost, host_save);
       *ahost = p;
     }
 
@@ -569,4 +569,4 @@ getport (int *alport, int af)
     }
 }
 
-#endif /* KERBEROS */
+#endif /* KERBEROS || SHISHI */
diff --git a/libls/print.c b/libls/print.c
index 062aca6..daf68a9 100644
--- a/libls/print.c
+++ b/libls/print.c
@@ -132,8 +132,9 @@ printlong (DISPLAY *dp)
                dp->s_block, (long long) howmany (sp->st_blocks, blocksize));
       strmode (sp->st_mode, buf);
       np = p->fts_pointer;
-      printf ("%s %*u %-*s  %-*s  ", buf, dp->s_nlink,
-             sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group);
+      printf ("%s %*d %-*s  %-*s  ",
+             buf, dp->s_nlink, (int) sp->st_nlink,
+             dp->s_user, np->user, dp->s_group, np->group);
       if (f_flags)
        printf ("%-*s ", dp->s_flags, np->flags);
       if (S_ISCHR (sp->st_mode) || S_ISBLK (sp->st_mode))
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 61491fb..62764ec 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -91,7 +91,7 @@ Data (TN_Authenticator * ap, int type, krb5_pointer d, int c)
   unsigned char *cd = (unsigned char *) d;
 
   if (c == -1)
-    c = strlen (cd);
+    c = strlen ((char *) cd);
 
   if (auth_debug_mode)
     {
diff --git a/src/rexecd.c b/src/rexecd.c
index 15bee0e..8de6a58 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -221,6 +221,7 @@ extern char **environ;
 
 char *getstr (const char *);
 
+#ifndef WITH_PAM
 static char *
 get_user_password (struct passwd *pwd)
 {
@@ -232,12 +233,16 @@ get_user_password (struct passwd *pwd)
 #endif
   return pw_text;
 }
+#endif /* !WITH_PAM */
 
 int
 doit (int f, struct sockaddr *fromp, socklen_t fromlen)
 {
-  char *cmdbuf, *cp, *namep;
-  char *user, *pass, *pw_password;
+  char *cmdbuf, *cp;
+  char *user, *pass;
+#ifndef WITH_PAM
+  char *namep, *pw_password;
+#endif
 #ifdef HAVE_GETPWNAM_R
   char *pwbuf;
   int pwbuflen;
@@ -365,7 +370,7 @@ doit (int f, struct sockaddr *fromp, socklen_t fromlen)
 
   endpwent ();
 
-#if !WITH_PAM
+#ifndef WITH_PAM
   /* Last need of elevated privilege.  */
   pw_password = get_user_password (pwd);
   if (*pw_password != '\0')
@@ -710,7 +715,8 @@ getstr (const char *err)
  */
 static int
 rexec_conv (int num, const struct pam_message **pam_msg,
-           struct pam_response **pam_resp, void *data)
+           struct pam_response **pam_resp,
+           void *data _GL_UNUSED_PARAMETER)
 {
   struct pam_response *resp;
 
diff --git a/src/rlogin.c b/src/rlogin.c
index b80aa90..b2a1f27 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -1020,19 +1020,21 @@ writer (void)
              continue;
            }
          if (c != escapechar)
+           {
 #ifdef ENCRYPTION
 # ifdef KERBEROS
-           if (doencrypt)
-             des_write (rem, (char *) &escapechar, 1);
-           else
+             if (doencrypt)
+               des_write (rem, (char *) &escapechar, 1);
+             else
 # elif defined(SHISHI)
-           if (doencrypt)
-             writeenc (handle, rem, (char *) &escapechar, 1, &wlen, &iv2,
-                       key, 2);
-           else
-# endif
-#endif
-             write (rem, &escapechar, 1);
+             if (doencrypt)
+               writeenc (handle, rem, (char *) &escapechar, 1, &wlen,
+                         &iv2, key, 2);
+             else
+# endif /* SHISHI */
+#endif /* ENCRYPTION */
+               write (rem, &escapechar, 1);
+           }
        }
 
 #ifdef ENCRYPTION
diff --git a/src/rsh.c b/src/rsh.c
index 94827c6..abfcb50 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -77,7 +77,7 @@
 #include <xalloc.h>
 #include <argp.h>
 #include <libinetutils.h>
-#include "xalloc.h"
+#include <unused-parameter.h>
 
 #ifdef KERBEROS
 # ifdef HAVE_KERBEROSIV_DES_H
@@ -171,7 +171,8 @@ static struct argp_option options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg,
+          struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   switch (key)
     {
diff --git a/src/rshd.c b/src/rshd.c
index 1108401..7b518b8 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -958,7 +958,7 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
   if (use_kerberos)
     {
       int rc;
-      char *err_msg;
+      const char *err_msg;
 
       rc = get_auth (STDIN_FILENO, &h, &ap, &enckey, &err_msg, &protocol,
                     &cksumtype, &cksum, &cksumlen, servername);
diff --git a/telnet/commands.c b/telnet/commands.c
index 8553771..a586018 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -2450,7 +2450,10 @@ tn (int argc, char *argv[])
 #endif
   const int on = 1;
   int err;
-  char *cmd, *hostp = 0, *hosttmp = 0, *portp = 0, *user = 0;
+  char *cmd, *hostp = 0, *portp = 0, *user = 0;
+#ifdef HAVE_IDN
+  char *hosttmp = 0;
+#endif
 
 #ifdef IPV6
   memset (&hints, 0, sizeof (hints));

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

Summary of changes:
 ChangeLog             |   36 ++++++++++++++++++++++++++++++++++++
 ftpd/ftpcmd.y         |   12 ++++++------
 libinetutils/kcmd.c   |    6 +++---
 libls/print.c         |    5 +++--
 libtelnet/kerberos5.c |    2 +-
 src/rexecd.c          |   14 ++++++++++----
 src/rlogin.c          |   22 ++++++++++++----------
 src/rsh.c             |    5 +++--
 src/rshd.c            |    2 +-
 telnet/commands.c     |    5 ++++-
 10 files changed, 79 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
GNU Inetutils