summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2009-02-26 20:07:05 +0000
committerSam Hartman <hartmans@mit.edu>2009-02-26 20:07:05 +0000
commitf860222766842720a2fbf8d4953c6dcacbe50afc (patch)
tree7fe4a756f58b7007c3258767474c07102b3467ef /src/include
parent159c4ceaa29e24dff59c7991769ec12007c8e3e9 (diff)
downloadkrb5-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/include')
-rw-r--r--src/include/krb5/krb5.hin8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index c0fdcd2d85..72a412a858 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -1718,6 +1718,14 @@ krb5_error_code KRB5_CALLCONV krb5_copy_authdata
(krb5_context,
krb5_authdata * const *,
krb5_authdata ***);
+krb5_error_code KRB5_CALLCONV krb5_merge_authdata
+ (krb5_context,
+ krb5_authdata * const *,
+ krb5_authdata *const *,
+ krb5_authdata ***);
+/* Merge two authdata arrays, such as the array from a ticket
+ * and authenticator */
+
krb5_error_code KRB5_CALLCONV krb5_copy_authenticator
(krb5_context,
const krb5_authenticator *,