diff options
| author | Tom Yu <tlyu@mit.edu> | 2004-08-31 20:18:25 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2004-08-31 20:18:25 +0000 |
| commit | 5b97794fdbdef90b04423acdca25cb1ae13e2cc8 (patch) | |
| tree | 39712b0a8246d067bf49a0fab656052a357aef97 | |
| parent | 45d43e2320293f1795eab31935fadd435c8fd618 (diff) | |
| download | krb5-5b97794fdbdef90b04423acdca25cb1ae13e2cc8.zip krb5-5b97794fdbdef90b04423acdca25cb1ae13e2cc8.tar.gz krb5-5b97794fdbdef90b04423acdca25cb1ae13e2cc8.tar.bz2 | |
pullup from trunk
ticket: 2682
version_fixed: 1.3.5
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-3@16708 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/appl/gssftp/ftpd/ChangeLog | 6 | ||||
| -rw-r--r-- | src/appl/gssftp/ftpd/ftpd.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index 7381476..4b7fffa 100644 --- a/src/appl/gssftp/ftpd/ChangeLog +++ b/src/appl/gssftp/ftpd/ChangeLog @@ -1,3 +1,9 @@ +2004-08-27 Sam Hartman <hartmans@mit.edu> + + * ftpd.c (passwd;): Patch from Garry Zacheiss to use + krb5_get_init_creds_password instead of krb5_get_in_tkt since + get_in_tkt is obselete + 2003-06-05 Sam Hartman <hartmans@mit.edu> * popen.c (ftpd_popen): Use fork not vfork diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c index 2a09bf3..d88b5be 100644 --- a/src/appl/gssftp/ftpd/ftpd.c +++ b/src/appl/gssftp/ftpd/ftpd.c @@ -960,12 +960,12 @@ char *name, *passwd; my_creds.times.endtime = now + 60 * 60 * 10; my_creds.times.renew_till = 0; - if (krb5_get_in_tkt_with_password(kcontext, 0, - 0, NULL, 0 /*preauth*/, - passwd, - ccache, - &my_creds, 0)) - goto nuke_ccache; + if (krb5_get_init_creds_password(kcontext, &my_creds, me, + passwd, NULL, NULL, 0, NULL, NULL)) + goto nuke_ccache; + + if (krb5_cc_store_cred(kcontext, ccache, &my_creds)) + goto nuke_ccache; if (!want_creds) { krb5_cc_destroy(kcontext, ccache); |