more changes from cygnus source

Fri Feb 16 15:51:59 1996  Mark Eichin  <eichin@cygnus.com>

	* ftpcmd.y (yylex): error handling changes from kbalk@hp.com.

Tue Jan 16 18:44:42 1996  Mark Eichin  <eichin@cygnus.com>

	* ftpd.c (user): 331 is more appropriate for kuserok failure.

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

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 9eed4bedf92a9ac3c49a7b8e36132be61b0dcd77..010009f4b7e80b1953a1ac624602e17aab6e793a 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 16 15:51:59 1996  Mark Eichin  <eichin@cygnus.com>
+
+       * ftpcmd.y (yylex): error handling changes from kbalk@hp.com.
+
+Tue Jan 16 18:44:42 1996  Mark Eichin  <eichin@cygnus.com>
+
+       * ftpd.c (user): 331 is more appropriate for kuserok failure.
+
 Wed Feb  7 13:33:41 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * Makefile.in (clean): Remove ftpd

diff --git a/src/appl/gssftp/ftpd/ftpcmd.y b/src/appl/gssftp/ftpd/ftpcmd.y
index d89b9d74674f81c372717ed88647326242f35018..31b5d62b43ece2a7eb7f56bee3bea66df46e5cce 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpcmd.y
+++ b/src/appl/gssftp/ftpd/ftpcmd.y
@@ -1123,6 +1123,11 @@ yylex()
                                dologout(0);
                        }
                        (void) alarm(0);
+
+                       /* If getline() finds an error, the string is null */
+                       if (*cbuf == '\0')
+                               continue;
+
 #ifdef SETPROCTITLE
                        if (strncasecmp(cbuf, "PASS", 4) != NULL)
                                setproctitle("%s: %s", proctitle, cbuf);

diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 375fa19ea00ded12642b2a288bba49d1a197c980..5a5a287a5cf4bff826ae31f79c692f4c13b42544 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -598,7 +598,7 @@ user(name)
                        kdata.pinst, kdata.prealm,
                        kerb_ok ? "" : " not",
                        name, kerb_ok ? "" : "; Password required.");
-               reply(kerb_ok ? 232 : 336, "%s", buf);
+               reply(kerb_ok ? 232 : 331, "%s", buf);
                syslog(kerb_ok ? LOG_INFO : LOG_ERR, "%s", buf);
        } else
 #endif /* KERBEROS */