From 8b53c6c4f21e08d63d2684d31d6310adf582ff0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 5 Dec 2005 11:52:45 +0000 Subject: [PATCH] Change gss_krb5_import_ccache to gss_krb5_import_cred, it can handle keytabs too. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16350 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/gssapi.h | 8 +++++--- lib/gssapi/krb5/gssapi.h | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/gssapi/gssapi.h b/lib/gssapi/gssapi.h index 88a4f1fdc..a498b22f6 100644 --- a/lib/gssapi/gssapi.h +++ b/lib/gssapi/gssapi.h @@ -774,9 +774,11 @@ OM_uint32 gss_krb5_copy_ccache struct krb5_ccache_data */*out*/); OM_uint32 -gss_krb5_import_ccache(OM_uint32 */*minor*/, - struct krb5_ccache_data * /*in*/, - gss_cred_id_t */*out*/); +gss_krb5_import_cred(OM_uint32 */*minor*/, + struct krb5_ccache_data * /*in*/, + struct Principal * /*keytab_principal*/, + struct krb5_keytab_data * /*keytab*/, + gss_cred_id_t */*out*/); OM_uint32 gss_krb5_get_tkt_flags (OM_uint32 */*minor*/, diff --git a/lib/gssapi/krb5/gssapi.h b/lib/gssapi/krb5/gssapi.h index 88a4f1fdc..a498b22f6 100644 --- a/lib/gssapi/krb5/gssapi.h +++ b/lib/gssapi/krb5/gssapi.h @@ -774,9 +774,11 @@ OM_uint32 gss_krb5_copy_ccache struct krb5_ccache_data */*out*/); OM_uint32 -gss_krb5_import_ccache(OM_uint32 */*minor*/, - struct krb5_ccache_data * /*in*/, - gss_cred_id_t */*out*/); +gss_krb5_import_cred(OM_uint32 */*minor*/, + struct krb5_ccache_data * /*in*/, + struct Principal * /*keytab_principal*/, + struct krb5_keytab_data * /*keytab*/, + gss_cred_id_t */*out*/); OM_uint32 gss_krb5_get_tkt_flags (OM_uint32 */*minor*/,