From 9bd24b75f3252817addc052673959bde7cad5ebc Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 22 Feb 2011 12:42:43 -0500 Subject: Add krb5_realm to the basic IPA options Previously, this was only handled by the internal LDAP and Kerberos providers, but this wasn't available early enough to properly handle setting up the krb5_service for failover and creating the krb5info files. --- src/providers/ipa/ipa_common.c | 5 +++-- src/providers/ipa/ipa_common.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index b748289b..94e43674 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -35,7 +35,8 @@ struct dp_option ipa_basic_opts[] = { { "ipa_hostname", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ipa_dyndns_update", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE }, { "ipa_dyndns_iface", DP_OPT_STRING, NULL_STRING, NULL_STRING}, - { "ipa_hbac_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING} + { "ipa_hbac_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING}, + { "krb5_realm", DP_OPT_STRING, NULL_STRING, NULL_STRING} }; struct dp_option ipa_def_ldap_opts[] = { @@ -642,7 +643,7 @@ int ipa_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, service->sdap->kinit_service_name = service->krb5_service->name; /* First check whether the realm has been manually specified */ - realm = dp_opt_get_string(options->id->basic, SDAP_KRB5_REALM); + realm = dp_opt_get_string(options->basic, IPA_KRB5_REALM); if (realm) { /* krb5_realm exists in the configuration, use it */ service->krb5_service->realm = diff --git a/src/providers/ipa/ipa_common.h b/src/providers/ipa/ipa_common.h index 85f22e8d..588aa63e 100644 --- a/src/providers/ipa/ipa_common.h +++ b/src/providers/ipa/ipa_common.h @@ -49,6 +49,7 @@ enum ipa_basic_opt { IPA_DYNDNS_UPDATE, IPA_DYNDNS_IFACE, IPA_HBAC_SEARCH_BASE, + IPA_KRB5_REALM, IPA_OPTS_BASIC /* opts counter */ }; -- cgit