diff options
| author | Zhanna Tsitkov <tsitkova@mit.edu> | 2013-01-09 12:03:13 -0500 |
|---|---|---|
| committer | Zhanna Tsitkov <tsitkova@mit.edu> | 2013-01-09 12:03:13 -0500 |
| commit | 941e26f9eb76471159e0a024aeac63f1b6e6ea45 (patch) | |
| tree | 5c04d4b97d5b408a8673b54cc77ee45d7cdb2dd5 /src/lib/gssapi/krb5 | |
| parent | bc8356d17ed8babebb811669c038e02c2b4e757e (diff) | |
| download | krb5-941e26f9eb76471159e0a024aeac63f1b6e6ea45.tar.gz krb5-941e26f9eb76471159e0a024aeac63f1b6e6ea45.tar.xz krb5-941e26f9eb76471159e0a024aeac63f1b6e6ea45.zip | |
Rename ccache configuration macros
KRB5_CONF_ prefix should be used for the krb5/kdc.conf parameters.
Use KRB5_CC_CONF_ prefix for cache configuration variables.
Diffstat (limited to 'src/lib/gssapi/krb5')
| -rw-r--r-- | src/lib/gssapi/krb5/acquire_cred.c | 10 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/s4u_gss_glue.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c index 258ec7440..4d499e4be 100644 --- a/src/lib/gssapi/krb5/acquire_cred.c +++ b/src/lib/gssapi/krb5/acquire_cred.c @@ -310,8 +310,8 @@ scan_cc_config(krb5_context context, krb5_gss_cred_id_rec *cred, if (config_princ->length != 2) return 0; - if (data_eq_string(config_princ->data[1], KRB5_CONF_PROXY_IMPERSONATOR) && - cred->impersonator == NULL) { + if (data_eq_string(config_princ->data[1], KRB5_CC_CONF_PROXY_IMPERSONATOR) + && cred->impersonator == NULL) { code = krb5int_copy_data_contents_add0(context, value, &data0); if (code) return code; @@ -319,8 +319,8 @@ scan_cc_config(krb5_context context, krb5_gss_cred_id_rec *cred, krb5_free_data_contents(context, &data0); if (code) return code; - } else if (data_eq_string(config_princ->data[1], KRB5_CONF_REFRESH_TIME) && - cred->refresh_time == 0) { + } else if (data_eq_string(config_princ->data[1], KRB5_CC_CONF_REFRESH_TIME) + && cred->refresh_time == 0) { code = krb5int_copy_data_contents_add0(context, value, &data0); if (code) return code; @@ -539,7 +539,7 @@ set_refresh_time(krb5_context context, krb5_ccache ccache, snprintf(buf, sizeof(buf), "%ld", (long)refresh_time); d = string2data(buf); - (void)krb5_cc_set_config(context, ccache, NULL, KRB5_CONF_REFRESH_TIME, + (void)krb5_cc_set_config(context, ccache, NULL, KRB5_CC_CONF_REFRESH_TIME, &d); krb5_clear_error_message(context); } diff --git a/src/lib/gssapi/krb5/s4u_gss_glue.c b/src/lib/gssapi/krb5/s4u_gss_glue.c index 79d83eec8..a7e720b80 100644 --- a/src/lib/gssapi/krb5/s4u_gss_glue.c +++ b/src/lib/gssapi/krb5/s4u_gss_glue.c @@ -193,7 +193,7 @@ make_proxy_cred(krb5_context context, krb5_gss_cred_id_t cred, data = string2data(str); code = krb5_cc_set_config(context, cred->ccache, NULL, - KRB5_CONF_PROXY_IMPERSONATOR, &data); + KRB5_CC_CONF_PROXY_IMPERSONATOR, &data); krb5_free_unparsed_name(context, str); if (code) return code; |