From 770632d95185c270946280ea7d569bd96d70d60a Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Wed, 29 Oct 1997 01:27:11 +0000
Subject: [PATCH] const and char-cleanup

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3694 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/libtelnet/auth.c      |  2 +-
 appl/telnet/libtelnet/kerberos5.c |  3 ++-
 appl/telnet/telnet/commands.c     | 12 ++++++------
 appl/telnet/telnet/main.c         |  2 +-
 appl/telnet/telnet/telnet.c       |  2 +-
 appl/telnet/telnet/terminal.c     |  4 ++--
 appl/telnet/telnet/utilities.c    |  2 +-
 appl/telnet/telnetd/utility.c     |  2 +-
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c
index ddd8aa59e..1a8896e34 100644
--- a/appl/telnet/libtelnet/auth.c
+++ b/appl/telnet/libtelnet/auth.c
@@ -527,7 +527,7 @@ auth_reply(unsigned char *data, int cnt)
 void
 auth_name(unsigned char *data, int cnt)
 {
-    unsigned char savename[256];
+    char savename[256];
 
     if (cnt < 1) {
 	if (auth_debug_mode)
diff --git a/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c
index f12d99b48..f2b0145f0 100644
--- a/appl/telnet/libtelnet/kerberos5.c
+++ b/appl/telnet/libtelnet/kerberos5.c
@@ -209,7 +209,8 @@ kerberos5_send(char *name, Authenticator *ap)
 	return(0);
     }
 
-    if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) {
+    if (!auth_sendname((unsigned char *)UserNameRequested,
+		       strlen(UserNameRequested))) {
 	if (auth_debug_mode)
 	    printf("Not enough room for user name\r\n");
 	return(0);
diff --git a/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c
index e16dc0b5c..6c51e8b70 100644
--- a/appl/telnet/telnet/commands.c
+++ b/appl/telnet/telnet/commands.c
@@ -1560,7 +1560,7 @@ env_init(void)
 
 		/* If this is not the full name, try to get it via DNS */
 		if (strchr(hbuf, '.') == 0) {
-			struct hostent *he = gethostbyname(hbuf);
+			struct hostent *he = roken_gethostbyname(hbuf);
 			if (he != 0)
 				strncpy(hbuf, he->h_name, 256);
 			hbuf[256] = '\0';
@@ -1602,7 +1602,7 @@ env_define(unsigned char *var, unsigned char *value)
 		if (ep->next)
 			ep->next->prev = ep;
 	}
-	ep->welldefined = opt_welldefined(var);
+	ep->welldefined = opt_welldefined((char *)var);
 	ep->export = 1;
 	ep->var = (unsigned char *)strdup((char *)var);
 	ep->value = (unsigned char *)strdup((char *)value);
@@ -2140,7 +2140,7 @@ tn(int argc, char **argv)
 	    if(host == NULL)
 		host = gethostbyname2(hostp, AF_INET);
 #else
-	    host = gethostbyname(hostp);
+	    host = roken_gethostbyname(hostp);
 #endif
 	    if (host) {
 		strncpy(_hostname, host->h_name, sizeof(_hostname));
@@ -2192,7 +2192,7 @@ tn(int argc, char **argv)
 	    telnetport = 0;
 	port = atoi(portp);
 	if (port == 0) {
-	    sp = getservbyname(portp, "tcp");
+	    sp = roken_getservbyname(portp, "tcp");
 	    if (sp)
 		port = sp->s_port;
 	    else {
@@ -2205,7 +2205,7 @@ tn(int argc, char **argv)
 	}
     } else {
 	if (sp == 0) {
-	    sp = getservbyname("telnet", "tcp");
+	    sp = roken_getservbyname("telnet", "tcp");
 	    if (sp == 0) {
 		fprintf(stderr, "telnet: tcp/telnet: unknown service\r\n");
 		setuid(getuid());
@@ -2649,7 +2649,7 @@ sourceroute(char *arg, char **cpp, int *lenp)
 
 		if ((tmp = inet_addr(cp)) != -1) {
 			sin_addr.s_addr = tmp;
-		} else if ((host = gethostbyname(cp))) {
+		} else if ((host = roken_gethostbyname(cp))) {
 #if	defined(h_addr)
 			memmove(&sin_addr,
 				host->h_addr_list[0],
diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c
index ebf4efcf7..547bdbc99 100644
--- a/appl/telnet/telnet/main.c
+++ b/appl/telnet/telnet/main.c
@@ -131,7 +131,7 @@ main(int argc, char **argv)
 		    /* sometimes we don't want a mangled display */
 		    char *p;
 		    if((p = getenv("DISPLAY")))
-			env_define("DISPLAY", p);
+			env_define("DISPLAY", (unsigned char*)p);
 		    break;
 		}
 		case 'E':
diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c
index e6e22a138..436e769ec 100644
--- a/appl/telnet/telnet/telnet.c
+++ b/appl/telnet/telnet/telnet.c
@@ -1471,7 +1471,7 @@ env_opt_add(unsigned char *ep)
 		opt_replyp = opt_reply + len - (opt_replyend - opt_replyp);
 		opt_replyend = opt_reply + len;
 	}
-	if (opt_welldefined(ep))
+	if (opt_welldefined((char *)ep))
 #ifdef	OLD_ENVIRON
 		if (telopt_environ == TELOPT_OLD_ENVIRON)
 			*opt_replyp++ = old_env_var;
diff --git a/appl/telnet/telnet/terminal.c b/appl/telnet/telnet/terminal.c
index 1e39a0702..e6afebf53 100644
--- a/appl/telnet/telnet/terminal.c
+++ b/appl/telnet/telnet/terminal.c
@@ -110,7 +110,7 @@ ttyflush(int drop)
 	    TerminalFlushOutput();
 	    /* we leave 'n' alone! */
 	} else {
-	    n = TerminalWrite(ttyoring.consume, n);
+	    n = TerminalWrite((char *)ttyoring.consume, n);
 	}
     }
     if (n > 0) {
@@ -125,7 +125,7 @@ ttyflush(int drop)
 	if (n1 == n && n0 > n) {
 		n1 = n0 - n;
 		if (!drop)
-			n1 = TerminalWrite(ttyoring.bottom, n1);
+			n1 = TerminalWrite((char *)ttyoring.bottom, n1);
 		if (n1 > 0)
 			n += n1;
 	}
diff --git a/appl/telnet/telnet/utilities.c b/appl/telnet/telnet/utilities.c
index 4beb1c53e..7f466eace 100644
--- a/appl/telnet/telnet/utilities.c
+++ b/appl/telnet/telnet/utilities.c
@@ -253,7 +253,7 @@ void
 printsub(char direction, unsigned char *pointer, int length)
 {
     int i;
-    char buf[512];
+    unsigned char buf[512];
     extern int want_status_response;
 
     if (showoptions || direction == 0 ||
diff --git a/appl/telnet/telnetd/utility.c b/appl/telnet/telnetd/utility.c
index 7c3b39610..367083b63 100644
--- a/appl/telnet/telnetd/utility.c
+++ b/appl/telnet/telnetd/utility.c
@@ -528,7 +528,7 @@ printsub(int direction, unsigned char *pointer, int length)
        			       		/* length of suboption data */
 {
     int i;
-    char buf[512];
+    unsigned char buf[512];
 
     if (!(diagnostic & TD_OPTIONS))
 	return;