summaryrefslogtreecommitdiff
path: root/src/providers/ad/ad_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/providers/ad/ad_common.c')
-rw-r--r--src/providers/ad/ad_common.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/providers/ad/ad_common.c b/src/providers/ad/ad_common.c
index ab62d64a..7b9e5137 100644
--- a/src/providers/ad/ad_common.c
+++ b/src/providers/ad/ad_common.c
@@ -525,7 +525,7 @@ errno_t
ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx,
const char *primary_servers,
const char *backup_servers,
- const char *krb5_realm,
+ const char *krb5_realm_str,
const char *ad_service,
const char *ad_gc_service,
const char *ad_domain,
@@ -585,13 +585,13 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx,
service->sdap->kinit_service_name = service->krb5_service->name;
service->gc->kinit_service_name = service->krb5_service->name;
- if (!krb5_realm) {
+ if (!krb5_realm_str) {
DEBUG(SSSDBG_CRIT_FAILURE, ("No Kerberos realm set\n"));
ret = EINVAL;
goto done;
}
service->krb5_service->realm =
- talloc_strdup(service->krb5_service, krb5_realm);
+ talloc_strdup(service->krb5_service, krb5_realm_str);
if (!service->krb5_service->realm) {
ret = ENOMEM;
goto done;
@@ -795,7 +795,7 @@ ad_set_ad_id_options(struct ad_options *ad_opts,
struct sdap_options *id_opts)
{
errno_t ret;
- char *krb5_realm;
+ char *krb5_realm_str;
char *keytab_path;
/* We only support Kerberos password policy with AD, so
@@ -810,20 +810,20 @@ ad_set_ad_id_options(struct ad_options *ad_opts,
}
/* Set the Kerberos Realm for GSSAPI */
- krb5_realm = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM);
- if (!krb5_realm) {
+ krb5_realm_str = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM);
+ if (!krb5_realm_str) {
/* Should be impossible, this is set in ad_get_common_options() */
DEBUG(SSSDBG_FATAL_FAILURE, ("No Kerberos realm\n"));
ret = EINVAL;
goto done;
}
- ret = dp_opt_set_string(id_opts->basic, SDAP_KRB5_REALM, krb5_realm);
+ ret = dp_opt_set_string(id_opts->basic, SDAP_KRB5_REALM, krb5_realm_str);
if (ret != EOK) goto done;
DEBUG(SSSDBG_CONF_SETTINGS,
("Option %s set to %s\n",
id_opts->basic[SDAP_KRB5_REALM].opt_name,
- krb5_realm));
+ krb5_realm_str));
keytab_path = dp_opt_get_string(ad_opts->basic, AD_KEYTAB);
if (keytab_path) {
@@ -983,7 +983,7 @@ ad_get_auth_options(TALLOC_CTX *mem_ctx,
errno_t ret;
struct dp_option *krb5_options;
const char *ad_servers;
- const char *krb5_realm;
+ const char *krb5_realm_str;
TALLOC_CTX *tmp_ctx = talloc_new(NULL);
if (!tmp_ctx) return ENOMEM;
@@ -1010,8 +1010,8 @@ ad_get_auth_options(TALLOC_CTX *mem_ctx,
/* Set krb5 realm */
/* Set the Kerberos Realm for GSSAPI */
- krb5_realm = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM);
- if (!krb5_realm) {
+ krb5_realm_str = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM);
+ if (!krb5_realm_str) {
/* Should be impossible, this is set in ad_get_common_options() */
DEBUG(SSSDBG_FATAL_FAILURE, ("No Kerberos realm\n"));
ret = EINVAL;
@@ -1021,12 +1021,12 @@ ad_get_auth_options(TALLOC_CTX *mem_ctx,
/* Force the kerberos realm to match the AD_KRB5_REALM (which may have
* been upper-cased in ad_common_options()
*/
- ret = dp_opt_set_string(krb5_options, KRB5_REALM, krb5_realm);
+ ret = dp_opt_set_string(krb5_options, KRB5_REALM, krb5_realm_str);
if (ret != EOK) goto done;
DEBUG(SSSDBG_CONF_SETTINGS,
("Option %s set to %s\n",
krb5_options[KRB5_REALM].opt_name,
- krb5_realm));
+ krb5_realm_str));
/* Set flag that controls whether we want to write the
* kdcinfo files at all