From 897f0b1f935fa441948c7372b22e97f1c1f8fe56 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Mon, 3 Sep 2001 05:54:18 +0000
Subject: [PATCH] unsigned char casts for is*, casts for socket functi, add
 headers

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10646 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/rcp/rcp.c                   | 2 +-
 appl/rsh/rsh.c                   | 5 +++--
 appl/telnet/libtelnet/genget.c   | 2 +-
 appl/telnet/telnet/telnet.c      | 2 +-
 appl/telnet/telnet/telnet_locl.h | 1 +
 appl/telnet/telnetd/utility.c    | 2 +-
 lib/kadm5/ipropd_master.c        | 4 ++--
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/appl/rcp/rcp.c b/appl/rcp/rcp.c
index 54dec17fd..a6e44b85d 100644
--- a/appl/rcp/rcp.c
+++ b/appl/rcp/rcp.c
@@ -513,7 +513,7 @@ sink(int argc, char **argv)
 		if (*cp++ != ' ')
 			SCREWUP("mode not delimited");
 
-		for (size = 0; isdigit(*cp);)
+		for (size = 0; isdigit((unsigned char)*cp);)
 			size = size * 10 + (*cp++ - '0');
 		if (*cp++ != ' ')
 			SCREWUP("size not delimited");
diff --git a/appl/rsh/rsh.c b/appl/rsh/rsh.c
index b8ac982b8..0e6ebf0bf 100644
--- a/appl/rsh/rsh.c
+++ b/appl/rsh/rsh.c
@@ -536,10 +536,11 @@ proto (int s, int errsock,
 
     if (sock_debug) {
 	int one = 1;
-	if (setsockopt(s, SOL_SOCKET, SO_DEBUG, &one, sizeof(one)) < 0)
+	if (setsockopt(s, SOL_SOCKET, SO_DEBUG, (void *)&one, sizeof(one)) < 0)
 	    warn("setsockopt remote");
 	if (errsock2 != -1 &&
-	    setsockopt(errsock2, SOL_SOCKET, SO_DEBUG, &one, sizeof(one)) < 0)
+	    setsockopt(errsock2, SOL_SOCKET, SO_DEBUG,
+		       (void *)&one, sizeof(one)) < 0)
 	    warn("setsockopt stderr");
     }
 
diff --git a/appl/telnet/libtelnet/genget.c b/appl/telnet/libtelnet/genget.c
index a0103d6b3..85dd005ac 100644
--- a/appl/telnet/libtelnet/genget.c
+++ b/appl/telnet/libtelnet/genget.c
@@ -57,7 +57,7 @@ isprefix(char *s1, char *s2)
     os1 = s1;
     c1 = *s1;
     c2 = *s2;
-    while (LOWER(c1) == LOWER(c2)) {
+    while (tolower((unsigned char)c1) == tolower((unsigned char)c2)) {
 	if (c1 == '\0')
 	    break;
 	c1 = *++s1;
diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c
index 59a23d30b..96e6403f4 100644
--- a/appl/telnet/telnet/telnet.c
+++ b/appl/telnet/telnet/telnet.c
@@ -579,7 +579,7 @@ mklist(char *buf, char *name)
 #define ISASCII(c) (!((c)&0x80))
 		if ((c == ' ') || !ISASCII(c))
 			n = 1;
-		else if (islower(c))
+		else if (islower((unsigned char)c))
 			*cp = toupper(c);
 	}
 
diff --git a/appl/telnet/telnet/telnet_locl.h b/appl/telnet/telnet/telnet_locl.h
index 248df95b0..79b5ab8d6 100644
--- a/appl/telnet/telnet/telnet_locl.h
+++ b/appl/telnet/telnet/telnet_locl.h
@@ -149,6 +149,7 @@
 #include <socks.h>
 #endif
 
+#include <err.h>
 #include <roken.h>
 /* krb.h? */
 
diff --git a/appl/telnet/telnetd/utility.c b/appl/telnet/telnetd/utility.c
index 26487ffb1..6ad8053d9 100644
--- a/appl/telnet/telnetd/utility.c
+++ b/appl/telnet/telnetd/utility.c
@@ -1152,7 +1152,7 @@ printdata(char *tag, char *ptr, int cnt)
 	output_data("%s: ", tag);
 	for (i = 0; i < 20 && cnt; i++) {
 	    output_data("%02x", *ptr);
-	    if (isprint(*ptr)) {
+	    if (isprint((unsigned char)*ptr)) {
 		xbuf[i] = *ptr;
 	    } else {
 		xbuf[i] = '.';
diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c
index 1b67af360..1a8d7bc88 100644
--- a/lib/kadm5/ipropd_master.c
+++ b/lib/kadm5/ipropd_master.c
@@ -65,7 +65,7 @@ make_listen_socket (krb5_context context)
     fd = socket (AF_INET, SOCK_STREAM, 0);
     if (fd < 0)
 	krb5_err (context, 1, errno, "socket AF_INET");
-    setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+    setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(one));
     memset (&addr, 0, sizeof(addr));
     addr.sin_family = AF_INET;
     addr.sin_port   = krb5_getportbyname (context,
@@ -461,7 +461,7 @@ main(int argc, char **argv)
 	    struct sockaddr_un peer_addr;
 	    socklen_t peer_len = sizeof(peer_addr);
 
-	    if(recvfrom(signal_fd, &vers, sizeof(vers), 0,
+	    if(recvfrom(signal_fd, (void *)&vers, sizeof(vers), 0,
 			(struct sockaddr *)&peer_addr, &peer_len) < 0) {
 		krb5_warn (context, errno, "recvfrom");
 		continue;