* ftpd.c (ftpd_userok): Don't undconditionally return -1

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

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index e9d9d671fa01c42ec105b35a8a07a6f528222c65..2a2e348aca9cf2fc3fcb8d3974c60365395c31f1 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 12 00:04:00 1996  Tom Yu  <tlyu@mit.edu>
+
+       * ftpd.c (ftpd_userok): Don't undconditionally return -1.
+
 Thu Nov  7 15:38:51 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * ftpd.c (ftpd_userok): Check return value of krb5_init_context()

diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 9065466b981160bd94f8ca2edab12af998f5cd22..b4a5794b9b404cec1eee7e214afc9650de377dc5 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -2333,7 +2333,8 @@ ftpd_userok(client_name, name)
        krb5_error_code kerr;
        
        kerr = krb5_init_context(&kc);
-       return -1;
+       if (kerr)
+               return -1;
 
        kerr = krb5_parse_name(kc, client_name->value, &p);
        if (kerr) { retval = -1; goto fail; }