oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

krb5: Add krb5_cccol_get_default_ccname()

Browse Source
This commit is contained in:
Nicolas Williams
2022-01-26 16:40:16 -06:00
parent a8037d1916
commit 2dec179e35
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/krb5/cache.c
View File

@@ -822,6 +822,17 @@ krb5_cc_configured_default_name(krb5_context context)
return context->configured_default_cc_name = expanded; return context->configured_default_cc_name = expanded;
} }
KRB5_LIB_FUNCTION char * KRB5_LIB_CALL
krb5_cccol_get_default_ccname(krb5_context context)
{
const char *cfg = get_default_cc_type(context, 1);
char *cccol_default_ccname;
const krb5_cc_ops *ops = krb5_cc_get_prefix_ops(context, cfg);
(void) (*ops->get_default_name)(context, &cccol_default_ccname);
return cccol_default_ccname;
}
/** /**
* Open the default ccache in `id'. * Open the default ccache in `id'.
* *
@@ -1651,7 +1662,8 @@ krb5_cc_move(krb5_context context, krb5_ccache from, krb5_ccache to)
ret = (*to->ops->move)(context, from, to); ret = (*to->ops->move)(context, from, to);
if (ret == 0) if (ret == 0)
return 0; return 0;
if (ret != EXDEV && ret != ENOTSUP && ret != KRB5_CC_NOSUPP) if (ret != EXDEV && ret != ENOTSUP && ret != KRB5_CC_NOSUPP &&
ret != KRB5_FCC_INTERNAL)
return ret; return ret;
/* Fallback to high-level copy */ /* Fallback to high-level copy */
} /* Else high-level copy */ } /* Else high-level copy */
@@ -1764,7 +1776,8 @@ krb5_cc_set_config(krb5_context context, krb5_ccache id,
/* Remove old configuration */ /* Remove old configuration */
ret = krb5_cc_remove_cred(context, id, 0, &cred); ret = krb5_cc_remove_cred(context, id, 0, &cred);
if (ret && ret != KRB5_CC_NOTFOUND && ret != KRB5_CC_NOSUPP) if (ret && ret != KRB5_CC_NOTFOUND && ret != KRB5_CC_NOSUPP &&
ret != KRB5_FCC_INTERNAL)
goto out; goto out;
if (data) { if (data) {

1
lib/krb5/libkrb5-exports.def.in
View File

@@ -750,6 +750,7 @@ EXPORTS
krb5_cccol_cursor_new krb5_cccol_cursor_new
krb5_cccol_cursor_next krb5_cccol_cursor_next
krb5_cccol_cursor_free krb5_cccol_cursor_free
krb5_cccol_get_default_ccname
; com_err error tables ; com_err error tables
initialize_krb5_error_table_r initialize_krb5_error_table_r

1
lib/krb5/version-script.map
View File

@@ -742,6 +742,7 @@ HEIMDAL_KRB5_2.0 {
krb5_cccol_cursor_new; krb5_cccol_cursor_new;
krb5_cccol_cursor_next; krb5_cccol_cursor_next;
krb5_cccol_cursor_free; krb5_cccol_cursor_free;
krb5_cccol_get_default_ccname;
# com_err error tables # com_err error tables
initialize_krb5_error_table_r; initialize_krb5_error_table_r;