summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2014-03-21 16:15:39 +0100
committerJakub Hrozek <jhrozek@redhat.com>2014-03-21 23:09:40 +0100
commit5744811daf558d5fd87316c29683f426386edbcc (patch)
tree1c6dd2292eb63a6e38f04537bcdaaa843fd359fc
parent8f692f25e13cf59bc49cbda4a261bee0bdbfcf35 (diff)
downloadsssd-5744811daf558d5fd87316c29683f426386edbcc.tar.gz
sssd-5744811daf558d5fd87316c29683f426386edbcc.tar.xz
sssd-5744811daf558d5fd87316c29683f426386edbcc.zip
krb5_client: rename krb5_set_canonicalize() to set_canonicalize_option()
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-rw-r--r--src/providers/krb5/krb5_child.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index a99c42f3f..6157e4e92 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -116,6 +116,20 @@ static krb5_error_code set_lifetime_options(krb5_get_init_creds_opt *options)
return 0;
}
+static void set_canonicalize_option(krb5_get_init_creds_opt *opts)
+{
+ int canonicalize = 0;
+ char *tmp_str;
+
+ tmp_str = getenv(SSSD_KRB5_CANONICALIZE);
+ if (tmp_str != NULL && strcasecmp(tmp_str, "true") == 0) {
+ canonicalize = 1;
+ }
+ DEBUG(SSSDBG_CONF_SETTINGS, ("%s is set to [%s]\n",
+ SSSD_KRB5_CANONICALIZE, tmp_str ? tmp_str : "not set"));
+ sss_krb5_get_init_creds_opt_set_canonicalize(opts, canonicalize);
+}
+
static void set_changepw_options(krb5_context ctx,
krb5_get_init_creds_opt *options)
{
@@ -875,20 +889,6 @@ done:
}
-static void krb5_set_canonicalize(krb5_get_init_creds_opt *opts)
-{
- int canonicalize = 0;
- char *tmp_str;
-
- tmp_str = getenv(SSSD_KRB5_CANONICALIZE);
- if (tmp_str != NULL && strcasecmp(tmp_str, "true") == 0) {
- canonicalize = 1;
- }
- DEBUG(SSSDBG_CONF_SETTINGS, ("%s is set to [%s]\n",
- SSSD_KRB5_CANONICALIZE, tmp_str ? tmp_str : "not set"));
- sss_krb5_get_init_creds_opt_set_canonicalize(opts, canonicalize);
-}
-
static krb5_error_code get_and_save_tgt_with_keytab(krb5_context ctx,
krb5_principal princ,
krb5_keytab keytab,
@@ -904,7 +904,7 @@ static krb5_error_code get_and_save_tgt_with_keytab(krb5_context ctx,
krb5_get_init_creds_opt_set_address_list(&options, NULL);
krb5_get_init_creds_opt_set_forwardable(&options, 0);
krb5_get_init_creds_opt_set_proxiable(&options, 0);
- krb5_set_canonicalize(&options);
+ set_canonicalize_option(&options);
kerr = krb5_get_init_creds_keytab(ctx, &creds, princ, keytab, 0, NULL,
&options);
@@ -1882,7 +1882,7 @@ static int k5c_setup(struct krb5_req *kr, uint32_t offline)
}
if (!offline) {
- krb5_set_canonicalize(kr->options);
+ set_canonicalize_option(kr->options);
use_fast_str = getenv(SSSD_KRB5_USE_FAST);
if (use_fast_str == NULL || strcasecmp(use_fast_str, "never") == 0) {