From: Ezra Peisach <epeisach@mit.edu>
Date: Fri, 15 Jun 2001 19:13:44 +0000 (+0000)
Subject:         * ftpcmd.y, ftpd.c: Cast argument to isspace()/isdigit() to int
X-Git-Tag: krb5-1.3-alpha1~1416
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b0c00bb65cab3652fa6280006c47eb4c22a8e3ad;p=krb5.git

    * ftpcmd.y, ftpd.c: Cast argument to isspace()/isdigit() to int

        * secure.h (SESSION): Pass pointer to C_Block as expected by
        krb5_mk_priv().

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13351 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 3a6280c58..33a8a2363 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-15  Ezra Peisach  <epeisach@mit.edu>
+
+	* ftpcmd.y, ftpd.c: Cast argument to isspace()/isdigit() to int.
+
+	* secure.h (SESSION): Pass pointer to C_Block as expected by
+	krb5_mk_priv().
+
 2001-06-08  Mitchell Berger  <mitchb@mit.edu>
 
 	* pathnames.h: _PATH_FTPUSERS renamed to _PATH_FTPUSERS_DEFAULT.
diff --git a/src/appl/gssftp/ftpd/ftpcmd.y b/src/appl/gssftp/ftpd/ftpcmd.y
index 664d0b6ee..1e4b9eadd 100644
--- a/src/appl/gssftp/ftpd/ftpcmd.y
+++ b/src/appl/gssftp/ftpd/ftpcmd.y
@@ -1316,9 +1316,9 @@ yylex()
 				cpos++;
 				return (SP);
 			}
-			if (isdigit(cbuf[cpos])) {
+			if (isdigit((int) cbuf[cpos])) {
 				cp = &cbuf[cpos];
-				while (isdigit(cbuf[++cpos]))
+				while (isdigit((int) cbuf[++cpos]))
 					;
 				c = cbuf[cpos];
 				cbuf[cpos] = '\0';
@@ -1331,9 +1331,9 @@ yylex()
 			goto dostr1;
 
 		case ARGS:
-			if (isdigit(cbuf[cpos])) {
+			if (isdigit((int) cbuf[cpos])) {
 				cp = &cbuf[cpos];
-				while (isdigit(cbuf[++cpos]))
+				while (isdigit((int) cbuf[++cpos]))
 					;
 				c = cbuf[cpos];
 				cbuf[cpos] = '\0';
@@ -1418,8 +1418,8 @@ upper(s)
 	register char *s;
 {
 	while (*s != '\0') {
-		if (islower(*s))
-			*s = toupper(*s);
+		if (islower((int) (*s)))
+			*s = toupper((int) (*s));
 		s++;
 	}
 }
diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index f5bbd5248..b7d77c906 100644
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -882,10 +882,10 @@ checkuser(name)
 			     int i = strlen(name) + 1;
 			     
 			     /* Make sure foo doesn't match foobar */
-			     if (line[i] == '\0' || !isspace(line[i]))
+			     if (line[i] == '\0' || !isspace((int) line[i]))
 			          continue;
 			     /* Ignore whitespace */
-			     while (isspace(line[++i]));
+			     while (isspace((int) line[++i]));
 
 			     if (strcmp(&line[i], "restrict") == 0)
 			          return (-1);
diff --git a/src/appl/gssftp/ftpd/secure.h b/src/appl/gssftp/ftpd/secure.h
index 60a9db4ce..2a0cb9d53 100644
--- a/src/appl/gssftp/ftpd/secure.h
+++ b/src/appl/gssftp/ftpd/secure.h
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #define CRED_DECL	extern AUTH_DAT kdata;
-#define SESSION		kdata.session
+#define SESSION		&kdata.session
 #define myaddr		data_source
 #define hisaddr		data_dest