diff --git a/lib/gssapi/gss_acquire_cred.3 b/lib/gssapi/gss_acquire_cred.3 index 5166b5cfe..3f366b9c5 100644 --- a/lib/gssapi/gss_acquire_cred.3 +++ b/lib/gssapi/gss_acquire_cred.3 @@ -62,6 +62,7 @@ .Nm gss_krb5_ccache_name , .Nm gss_krb5_compat_des3_mic , .Nm gss_krb5_copy_ccache , +.Nm gss_krb5_import_cred .Nm gsskrb5_extract_authz_data_from_sec_context , .Nm gss_krb5_import_ccache , .Nm gss_krb5_get_tkt_flags , @@ -294,6 +295,14 @@ GSS-API library (libgssapi, -lgssapi) .Fa "krb5_ccache out" .Fc .Ft OM_uint32 +.Fo gss_krb5_import_cred +.Fa "OM_uint32 *minor_status" +.Fa "krb5_ccache id" +.Fa "krb5_principal keytab_principal" +.Fa "krb5_keytab keytab" +.Fa "gss_cred_id_t *cred" +.Fc +.Ft OM_uint32 .Fo gss_krb5_compat_des3_mic .Fa "OM_uint32 * minor_status" .Fa "gss_ctx_id_t context_handle" @@ -307,9 +316,10 @@ GSS-API library (libgssapi, -lgssapi) .Fa "gss_buffer_t ad_data" .Fc .Ft OM_uint32 -.Fo gss_krb5_import_ccache +.Fo gss_krb5_import_cache .Fa "OM_uint32 *minor" -.Fa "krb5_ccache out" +.Fa "krb5_ccache id" +.Fa "krb5_keytab keytab" .Fa "gss_cred_id_t *cred" .Fc .Ft OM_uint32 @@ -620,9 +630,9 @@ mechanism. The acceptor receives the delegated token in the last argument to .Fn gss_accept_sec_context . .Pp -.Fn gss_krb5_import_ccache -will import the krb5 credentials into gss credential so it can be used -withing GSS-API. +.Fn gss_krb5_import_cred +will import the krb5 credentials (both keytab and/or credential cache) +into gss credential so it can be used withing GSS-API. The .Fa ccache is copied by reference and thus shared, so if the credential is destroyed diff --git a/lib/gssapi/krb5/gss_acquire_cred.3 b/lib/gssapi/krb5/gss_acquire_cred.3 index 5166b5cfe..3f366b9c5 100644 --- a/lib/gssapi/krb5/gss_acquire_cred.3 +++ b/lib/gssapi/krb5/gss_acquire_cred.3 @@ -62,6 +62,7 @@ .Nm gss_krb5_ccache_name , .Nm gss_krb5_compat_des3_mic , .Nm gss_krb5_copy_ccache , +.Nm gss_krb5_import_cred .Nm gsskrb5_extract_authz_data_from_sec_context , .Nm gss_krb5_import_ccache , .Nm gss_krb5_get_tkt_flags , @@ -294,6 +295,14 @@ GSS-API library (libgssapi, -lgssapi) .Fa "krb5_ccache out" .Fc .Ft OM_uint32 +.Fo gss_krb5_import_cred +.Fa "OM_uint32 *minor_status" +.Fa "krb5_ccache id" +.Fa "krb5_principal keytab_principal" +.Fa "krb5_keytab keytab" +.Fa "gss_cred_id_t *cred" +.Fc +.Ft OM_uint32 .Fo gss_krb5_compat_des3_mic .Fa "OM_uint32 * minor_status" .Fa "gss_ctx_id_t context_handle" @@ -307,9 +316,10 @@ GSS-API library (libgssapi, -lgssapi) .Fa "gss_buffer_t ad_data" .Fc .Ft OM_uint32 -.Fo gss_krb5_import_ccache +.Fo gss_krb5_import_cache .Fa "OM_uint32 *minor" -.Fa "krb5_ccache out" +.Fa "krb5_ccache id" +.Fa "krb5_keytab keytab" .Fa "gss_cred_id_t *cred" .Fc .Ft OM_uint32 @@ -620,9 +630,9 @@ mechanism. The acceptor receives the delegated token in the last argument to .Fn gss_accept_sec_context . .Pp -.Fn gss_krb5_import_ccache -will import the krb5 credentials into gss credential so it can be used -withing GSS-API. +.Fn gss_krb5_import_cred +will import the krb5 credentials (both keytab and/or credential cache) +into gss credential so it can be used withing GSS-API. The .Fa ccache is copied by reference and thus shared, so if the credential is destroyed