diff options
| author | Sam Hartman <hartmans@mit.edu> | 2004-08-27 19:12:13 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2004-08-27 19:12:13 +0000 |
| commit | c226f8300720e781dd43bebe5afadf8f9b66d28b (patch) | |
| tree | 7cb99c81d5101e724e325c5973a35c01644bcbb8 /src/appl | |
| parent | 5131c693f5ec34eaddef6d94b2981b79ca45a6e7 (diff) | |
| download | krb5-c226f8300720e781dd43bebe5afadf8f9b66d28b.zip krb5-c226f8300720e781dd43bebe5afadf8f9b66d28b.tar.gz krb5-c226f8300720e781dd43bebe5afadf8f9b66d28b.tar.bz2 | |
Patch from Garry Zacheiss to use krb5_get_init_creds_password in ftpd
not krb5_get_in_tkt_password in order to avoid the prompter being
called.
Ticket: 2682
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16688 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
| -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 f070162..1112b3f 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 + 2004-08-08 Ken Raeburn <raeburn@mit.edu> * ftpd.c (main): Use socklen_t for the size of the address from diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c index b3359ae..eabc74f 100644 --- a/src/appl/gssftp/ftpd/ftpd.c +++ b/src/appl/gssftp/ftpd/ftpd.c @@ -963,12 +963,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); |