[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-16-gbbff25d

[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  bbff25dd378415078f3498d877e376c8160f9de7 (commit)
      from  1db1e91f34f1c31a297c3c65417ac4f93a7a404f (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=bbff25dd378415078f3498d877e376c8160f9de7


commit bbff25dd378415078f3498d877e376c8160f9de7
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Apr 25 14:21:45 2014 +0200

    Silence warnings with libshishi.

diff --git a/ChangeLog b/ChangeLog
index a5155b9..1f0a0b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2014-04-25  Mats Erik Andersson  <address@hidden>
+
+       Silence warnings with libshishi.
+
+       * libinetutils/kcmd.c [KERBEROS || SHISHI] (kcmd):
+       Declare realm argument as `const char *'.
+       * libinetutils/krcmd.c [KERBEROS || SHISHI]
+       (kcmd, krcmd, krcmd_mutual): Likewise.
+       * libinetutils/shishi.c [SHISHI] (shishi_auth): Likewise.
+       * libinetutils/shishi_def.h [SHISHI] (shishi_auth, krcmd)
+       (krcmd_mutual): Likewise.
+       * src/rcp.c [KERBEROS || SHISHI] (dest_realm): Likewise.
+       * src/rlogin.c [KERBEROS || SHISHI] (dest_realm): Likewise.
+       * src/rsh.c [KERBEROS || SHISHI] (dest_realm): Likewise.
+
+       * src/rlogind.c (rlogind_auth): Initialize HOSTNAME.
+
 2014-03-28  Mats Erik Andersson  <address@hidden>
 
        syslogd: Local time option.
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 35a610f..ac8afaa 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -94,13 +94,13 @@ int getport (int *, int);
 int
 kcmd (int *sock, char **ahost, unsigned short rport, char *locuser,
       char *remuser, char *cmd, int *fd2p, KTEXT ticket,
-      char *service, char *realm,
+      char *service, const char *realm,
       CREDENTIALS * cred, Key_schedule schedule, MSG_DAT * msg_data,
       struct sockaddr_in *laddr, struct sockaddr_in *faddr, long authopts)
 # elif defined(SHISHI)
 int
 kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char 
*locuser,
-      char **remuser, char *cmd, int *fd2p, char *service, char *realm,
+      char **remuser, char *cmd, int *fd2p, char *service, const char *realm,
       Shishi_key ** key, struct sockaddr_storage *laddr,
       struct sockaddr_storage *faddr, long authopts, int af)
 # endif
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index e4f4bdd..ce6d927 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -80,12 +80,12 @@
 
 # if defined SHISHI
 int kcmd (Shishi **, int *, char **, unsigned short, char *, char **,
-         char *, int *, char *, char *, Shishi_key **,
+         char *, int *, char *, const char *, Shishi_key **,
          struct sockaddr_storage *, struct sockaddr_storage *,
          long, int);
 # else
 int kcmd (int *, char **, unsigned short, char *, char *, char *, int *,
-         KTEXT, char *, char *, CREDENTIALS *, Key_schedule,
+         KTEXT, char *, const char *, CREDENTIALS *, Key_schedule,
          MSG_DAT *, struct sockaddr_in *, struct sockaddr_in *, long);
 # endif
 
@@ -104,7 +104,7 @@ static struct passwd pwstor, *pwd;
 
 int
 krcmd (Shishi ** h, char **ahost, unsigned short rport, char **remuser, char 
*cmd,
-       int *fd2p, char *realm, int af)
+       int *fd2p, const char *realm, int af)
 {
   int sock = -1, err = 0;
   long authopts = 0L;
@@ -149,7 +149,7 @@ krcmd (Shishi ** h, char **ahost, unsigned short rport, 
char **remuser, char *cm
 # elif defined(KERBEROS)
 int
 krcmd (char **ahost, unsigned short rport, char *remuser, char *cmd, int *fd2p,
-       char *realm)
+       const char *realm)
 {
   int sock = -1, err = 0;
   KTEXT_ST ticket;
@@ -179,7 +179,7 @@ krcmd (char **ahost, unsigned short rport, char *remuser, 
char *cmd, int *fd2p,
 #  if defined SHISHI
 int
 krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport, char **remuser,
-             char *cmd, int *fd2p, char *realm, Shishi_key ** key, int af)
+             char *cmd, int *fd2p, const char *realm, Shishi_key ** key, int 
af)
 {
   int sock = -1, err = 0;
   struct sockaddr_storage laddr, faddr;
@@ -226,7 +226,7 @@ krcmd_mutual (Shishi ** h, char **ahost, unsigned short 
rport, char **remuser,
 #  elif defined(KERBEROS)
 int
 krcmd_mutual (char **ahost, unsigned short rport, char *remuser, char *cmd,
-             int *fd2p, char *realm, CREDENTIALS * cred, Key_schedule sched)
+             int *fd2p, const char *realm, CREDENTIALS * cred, Key_schedule 
sched)
 {
   int sock, err;
   KTEXT_ST ticket;
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index dea6165..e6edaba 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -32,7 +32,8 @@
 int
 shishi_auth (Shishi ** handle, int verbose, char **cname,
             const char *sname, int sock, char *cmd,
-            unsigned short port, Shishi_key ** enckey, char *realm)
+            unsigned short port, Shishi_key ** enckey,
+            const char *realm)
 {
   Shishi_ap *ap;
   Shishi_tkt *tkt;
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index e91b230..9e8276a 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -58,7 +58,7 @@ struct auth_data
 extern int shishi_auth (Shishi ** handle, int verbose, char **cname,
                        const char *sname, int sock, char *cmd,
                        unsigned short port, Shishi_key ** enckey,
-                       char *realm);
+                       const char *realm);
 
 extern int get_auth (int infd, Shishi ** handle, Shishi_ap ** ap,
                     Shishi_key ** enckey, const char **err_msg,
@@ -73,10 +73,10 @@ extern int writeenc (Shishi * h, int sock, char *buf, int 
wlen, int *len,
 
 extern int krcmd (Shishi ** h, char **ahost, unsigned short rport,
                  char **remuser, char *cmd, int *fd2p,
-                 char *realm, int af);
+                 const char *realm, int af);
 
 extern int krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport,
-                        char **remuser, char *cmd, int *fd2p, char *realm,
-                        Shishi_key ** key, int af);
+                        char **remuser, char *cmd, int *fd2p,
+                        const char *realm, Shishi_key ** key, int af);
 
 #endif
diff --git a/src/rcp.c b/src/rcp.c
index 62b53b2..234beac 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -118,7 +118,7 @@ void verifydir (char *);
 #endif /* KERBEROS */
 
 #if defined KERBEROS || defined SHISHI
-char *dest_realm = NULL;
+const char *dest_realm = NULL;
 int use_kerberos = 1;
 int doencrypt = 0;
 
diff --git a/src/rlogin.c b/src/rlogin.c
index 91d8187..f3d909e 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -123,12 +123,14 @@
 #if defined KERBEROS || defined SHISHI
 int use_kerberos = 1, doencrypt;
 # ifdef KERBEROS
-char dest_realm_buf[REALM_SZ], *dest_realm = NULL;
+char dest_realm_buf[REALM_SZ];
+const char *dest_realm = NULL;
 CREDENTIALS cred;
 Key_schedule schedule;
 
 # elif defined(SHISHI)
-char dest_realm_buf[REALM_SZ], *dest_realm = NULL;
+char dest_realm_buf[REALM_SZ];
+const char *dest_realm = NULL;
 
 Shishi *handle;
 Shishi_key *key;
diff --git a/src/rlogind.c b/src/rlogind.c
index 1e3e866..1bb84fb 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -865,7 +865,7 @@ rlogind_auth (int fd, struct auth_data *ap)
   struct hostent *hp;
   void *addrp;
 #endif
-  char *hostname;
+  char *hostname = "";
   int authenticated = 0;
   int port;
 
diff --git a/src/rsh.c b/src/rsh.c
index 44a0421..091ccd0 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -102,7 +102,7 @@ sa_family_t family = AF_UNSPEC;
 
 #if defined KERBEROS || defined SHISHI
 int use_kerberos = 1, doencrypt;
-char *dest_realm = NULL;
+const char *dest_realm = NULL;
 
 # ifdef KERBEROS
 CREDENTIALS cred;

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

Summary of changes:
 ChangeLog                 |   17 +++++++++++++++++
 libinetutils/kcmd.c       |    4 ++--
 libinetutils/krcmd.c      |   12 ++++++------
 libinetutils/shishi.c     |    3 ++-
 libinetutils/shishi_def.h |    8 ++++----
 src/rcp.c                 |    2 +-
 src/rlogin.c              |    6 ++++--
 src/rlogind.c             |    2 +-
 src/rsh.c                 |    2 +-
 9 files changed, 38 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU Inetutils