diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2011-02-22 12:42:43 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-02-22 15:21:53 -0500 |
| commit | 37466404493feec6d684168e3dd3558ea1e1fb7b (patch) | |
| tree | c7365c5a2556c8e8eb7776618c1c5c0d7bcfb509 | |
| parent | 0d38193c989f25e951ac960b7c1ded8f3832d800 (diff) | |
| download | sssd-37466404493feec6d684168e3dd3558ea1e1fb7b.tar.gz sssd-37466404493feec6d684168e3dd3558ea1e1fb7b.tar.xz sssd-37466404493feec6d684168e3dd3558ea1e1fb7b.zip | |
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.
| -rw-r--r-- | src/providers/ipa/ipa_common.c | 5 | ||||
| -rw-r--r-- | 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 b748289bc..94e436743 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 85f22e8df..588aa63e4 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 */ }; |