From e76d9a48c905e6db8ea9b7af4b843070756effaa Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Mon, 27 Sep 2010 03:39:22 +0000 Subject: Add gss_krb5_import_cred Add gss_krb5_import_cred from Heimdal; allows krb5 creds to be acquired from a keytab or ccache into a GSSAPI credential without using global process or thread variables. Merged from the users/lhoward/import-cred branch. ticket: 6785 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24356 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/generic/gssapi_ext.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/lib/gssapi/generic') diff --git a/src/lib/gssapi/generic/gssapi_ext.h b/src/lib/gssapi/generic/gssapi_ext.h index 8e5c7c9f7..d68b6cd0a 100644 --- a/src/lib/gssapi/generic/gssapi_ext.h +++ b/src/lib/gssapi/generic/gssapi_ext.h @@ -115,10 +115,9 @@ OM_uint32 KRB5_CALLCONV gss_set_sec_context_option const gss_OID /*desired_object*/, const gss_buffer_t /*value*/); -/* XXX do these really belong in this header? */ -OM_uint32 KRB5_CALLCONV gssspi_set_cred_option +OM_uint32 KRB5_CALLCONV gss_set_cred_option (OM_uint32 * /*minor_status*/, - gss_cred_id_t /*cred*/, + gss_cred_id_t * /*cred*/, const gss_OID /*desired_object*/, const gss_buffer_t /*value*/); -- cgit