diff options
| author | Mark Eichin <eichin@mit.edu> | 1996-02-24 02:26:19 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1996-02-24 02:26:19 +0000 |
| commit | 5637ea19be70c9ab80a1d59636f9043118cefb89 (patch) | |
| tree | 7b4e1232d3fe670191388b1702a6ef1103d9fa7d /src | |
| parent | 27feb06a00ea5828fa8f90b4daf3f108b8392ea8 (diff) | |
| download | krb5-5637ea19be70c9ab80a1d59636f9043118cefb89.tar.gz krb5-5637ea19be70c9ab80a1d59636f9043118cefb89.tar.xz krb5-5637ea19be70c9ab80a1d59636f9043118cefb89.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/gssftp/ftpd/ChangeLog | 8 | ||||
| -rw-r--r-- | src/appl/gssftp/ftpd/ftpcmd.y | 5 | ||||
| -rw-r--r-- | src/appl/gssftp/ftpd/ftpd.c | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index 9eed4bedf..010009f4b 100644 --- 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 d89b9d746..31b5d62b4 100644 --- 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 375fa19ea..5a5a287a5 100644 --- 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 */ |