summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-10-25 18:30:14 +0000
committerGreg Hudson <ghudson@mit.edu>2011-10-25 18:30:14 +0000
commitcf14be326bc26256dd88222100744e18ef139040 (patch)
treec1615675171eb1d515bff9d52c85d49f2150c822 /src/include
parent7fc21c4a4a6ef8a88567f166eda1fe73784686c7 (diff)
downloadkrb5-cf14be326bc26256dd88222100744e18ef139040.tar.gz
krb5-cf14be326bc26256dd88222100744e18ef139040.tar.xz
krb5-cf14be326bc26256dd88222100744e18ef139040.zip
Make krb5_find_authdata public
Rename krb5int_find_authdata to krb5_find_authdata and make it public. ticket: 6992 target_version: 1.10 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25414 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/k5-int.h6
-rw-r--r--src/include/krb5/krb5.hin21
2 files changed, 21 insertions, 6 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 53504c7977..92cbe87f5e 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -2615,12 +2615,6 @@ krb5_error_code KRB5_CALLCONV krb5_get_default_config_files(char ***filenames);
void KRB5_CALLCONV krb5_free_config_files(char **filenames);
-krb5_error_code krb5int_find_authdata(krb5_context context,
- krb5_authdata *const *ticket_authdata,
- krb5_authdata *const *ap_req_authdata,
- krb5_authdatatype ad_type,
- krb5_authdata ***results);
-
krb5_error_code krb5_rd_req_decoded(krb5_context, krb5_auth_context *,
const krb5_ap_req *, krb5_const_principal,
krb5_keytab, krb5_flags *, krb5_ticket **);
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index d3829791dc..28f83d5ae2 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -3844,6 +3844,27 @@ krb5_copy_authdata(krb5_context context,
krb5_authdata *const *in_authdat, krb5_authdata ***out);
/**
+ * Find authorization data elements.
+ *
+ * @param [in] context Library context
+ * @param [in] ticket_authdata Authorization data list from ticket
+ * @param [in] ap_req_authdata Authorization data list from AP request
+ * @param [in] ad_type Authorization data type to find
+ * @param [out] results List of matching entries
+ *
+ * This function searches @a ticket_authdata and @a ap_req_authdata for
+ * elements of type @a ad_type. Either input list may be NULL, in which case
+ * it will not be searched; otherwise, the input lists must be terminated by
+ * NULL entries. This function will search inside AD-IF-RELEVANT containers if
+ * found in either list. Use krb5_free_authdata() to free @a results when it
+ * is no longer needed.
+ */
+krb5_error_code KRB5_CALLCONV
+krb5_find_authdata(krb5_context context, krb5_authdata *const *ticket_authdata,
+ krb5_authdata *const *ap_req_authdata,
+ krb5_authdatatype ad_type, krb5_authdata ***results);
+
+/**
* Merge two authorization data lists into a new list.
*
* @param [in] context Library context