* 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 3a6280c580b0e94cc5cd8fe15503b0b719e3e2ed..33a8a2363dad55e7041f87ec07380097fae90cff 100644 (file)
--- 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 664d0b6ee919b9b6c0a0f8b7532262c44d0d1127..1e4b9eadd09741b29603f5e87e071ce617678f81 100644 (file)
--- 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 f5bbd524877051dad7b3c400f13fc95d2ffeb012..b7d77c9065f0f8492f725c490bad1d051e0dbc86 100644 (file)
--- 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 60a9db4ce65b516b743932702df01d5d1c42730c..2a0cb9d53acb0d93f2212331005b03bd07f3665e 100644 (file)
--- 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