diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-11-20 22:15:37 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-11-20 22:15:37 +0000 |
| commit | 76f92036fdf4ceb5853ee70965370d351f3ddf80 (patch) | |
| tree | 83c208827674e3afa3b6e03e49210cfffe9eb7db /src/appl | |
| parent | 2e54b27ba948d74ce470823fdca9710eba3f0c97 (diff) | |
| download | krb5-76f92036fdf4ceb5853ee70965370d351f3ddf80.tar.gz krb5-76f92036fdf4ceb5853ee70965370d351f3ddf80.tar.xz krb5-76f92036fdf4ceb5853ee70965370d351f3ddf80.zip | |
* forward.c (rd_and_store_for_creds): Fix up to no longer do the
chown [krb5-appl/502]
* kerberos5.c (kerberos5_is): Fix up call to
rd_and_store_for_creds. [krb5-appl/502]
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10302 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/telnet/libtelnet/ChangeLog | 8 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/forward.c | 11 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/kerberos5.c | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog index cea7cca382..df22164b7a 100644 --- a/src/appl/telnet/libtelnet/ChangeLog +++ b/src/appl/telnet/libtelnet/ChangeLog @@ -1,3 +1,11 @@ +Thu Nov 20 17:13:42 1997 Tom Yu <tlyu@mit.edu> + + * forward.c (rd_and_store_for_creds): Fix up to no longer do the + chown [krb5-appl/502] + + * kerberos5.c (kerberos5_is): Fix up call to + rd_and_store_for_creds. [krb5-appl/502] + Tue Oct 21 10:54:22 1997 Ezra Peisach <epeisach@mit.edu> * enc_des.c: Include string.h/strings.h for memcpy prototype diff --git a/src/appl/telnet/libtelnet/forward.c b/src/appl/telnet/libtelnet/forward.c index a0ea5b34ff..2d13067efa 100644 --- a/src/appl/telnet/libtelnet/forward.c +++ b/src/appl/telnet/libtelnet/forward.c @@ -25,7 +25,6 @@ #if defined(KERBEROS) || defined(KRB5) #include <stdio.h> -#include <pwd.h> #include <netdb.h> #include "k5-int.h" @@ -34,23 +33,18 @@ extern char *line; /* see sys_term.c */ /* Decode, decrypt and store the forwarded creds in the local ccache. */ krb5_error_code -rd_and_store_for_creds(context, auth_context, inbuf, ticket, lusername) +rd_and_store_for_creds(context, auth_context, inbuf, ticket) krb5_context context; krb5_auth_context auth_context; krb5_data *inbuf; krb5_ticket *ticket; - char *lusername; { krb5_creds **creds; krb5_error_code retval; char ccname[35]; krb5_ccache ccache = NULL; - struct passwd *pwd; char *tty; - if (!(pwd = (struct passwd *) getpwnam(lusername))) - return -1; - if (retval = krb5_rd_cred(context, auth_context, inbuf, &creds, NULL)) return(retval); @@ -66,9 +60,6 @@ rd_and_store_for_creds(context, auth_context, inbuf, ticket, lusername) if (retval = krb5_cc_store_cred(context, ccache, *creds)) goto cleanup; - if (retval = chown(ccname+5, pwd->pw_uid, -1)) - goto cleanup; - cleanup: krb5_free_creds(context, *creds); return retval; diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c index 960cb17934..9741e83ac8 100644 --- a/src/appl/telnet/libtelnet/kerberos5.c +++ b/src/appl/telnet/libtelnet/kerberos5.c @@ -529,7 +529,7 @@ kerberos5_is(ap, data, cnt) if ((r = krb5_auth_con_genaddrs(telnet_context, auth_context, net, KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR)) || (r = rd_and_store_for_creds(telnet_context, auth_context, - &inbuf, ticket, UserNameRequested))) { + &inbuf, ticket))) { char errbuf[128]; |