diff options
| author | Sam Hartman <hartmans@mit.edu> | 2009-02-26 20:07:05 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2009-02-26 20:07:05 +0000 |
| commit | f860222766842720a2fbf8d4953c6dcacbe50afc (patch) | |
| tree | 7fe4a756f58b7007c3258767474c07102b3467ef /src/lib/gssapi | |
| parent | 159c4ceaa29e24dff59c7991769ec12007c8e3e9 (diff) | |
| download | krb5-f860222766842720a2fbf8d4953c6dcacbe50afc.tar.gz krb5-f860222766842720a2fbf8d4953c6dcacbe50afc.tar.xz krb5-f860222766842720a2fbf8d4953c6dcacbe50afc.zip | |
Include authenticator and ticket authdata in gss-api
Currently, the GSS-API routines for handling authdata only extract the
authorization data from the ticket, not that from the authenticator.
This is incorrect. Introduce a new function krb5_merge_authadata to
merge two authdata arrays into a newly allocated result array. Use
this function in accept_sec_context.c to include both sets of
authdata.
ticket: 6400
Target_version: 1.7
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22056 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/krb5/accept_sec_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index e2ec1fe76a..dd17c044b6 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -811,9 +811,9 @@ kg_accept_krb5(minor_status, context_handle, } /* XXX move this into gss_name_t */ - if (ticket->enc_part2->authorization_data != NULL && - (code = krb5_copy_authdata(context, + if ( (code = krb5_merge_authdata(context, ticket->enc_part2->authorization_data, + authdat->authorization_data, &ctx->authdata))) { major_status = GSS_S_FAILURE; goto fail; |