From fa0dba8f5536537a69d47218f2372d0f2582c12e Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Jan 08 2013 16:14:54 +0000 Subject: IPA: Rename IPA_CONFIG_SELINUX_DEFAULT_MAP It is not a map, but a default context. The name should reflect that. --- diff --git a/src/providers/ipa/ipa_config.c b/src/providers/ipa/ipa_config.c index 25f1e37..05231cc 100644 --- a/src/providers/ipa/ipa_config.c +++ b/src/providers/ipa/ipa_config.c @@ -61,7 +61,7 @@ ipa_get_config_send(TALLOC_CTX *mem_ctx, goto done; } state->attrs[0] = IPA_CONFIG_MIGRATION_ENABLED; - state->attrs[1] = IPA_CONFIG_SELINUX_DEFAULT_MAP; + state->attrs[1] = IPA_CONFIG_SELINUX_DEFAULT_USER_CTX; state->attrs[2] = IPA_CONFIG_SELINUX_MAP_ORDER; state->attrs[3] = NULL; } else { diff --git a/src/providers/ipa/ipa_config.h b/src/providers/ipa/ipa_config.h index 9a25984..2f1e147 100644 --- a/src/providers/ipa/ipa_config.h +++ b/src/providers/ipa/ipa_config.h @@ -31,7 +31,7 @@ #include "providers/ldap/ldap_common.h" #include "db/sysdb.h" -#define IPA_CONFIG_SELINUX_DEFAULT_MAP "ipaSELinuxUserMapDefault" +#define IPA_CONFIG_SELINUX_DEFAULT_USER_CTX "ipaSELinuxUserMapDefault" #define IPA_CONFIG_SELINUX_MAP_ORDER "ipaSELinuxUserMapOrder" #define IPA_CONFIG_MIGRATION_ENABLED "ipaMigrationEnabled" #define IPA_CONFIG_SEARCH_BASE_TEMPLATE "cn=etc,%s" diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c index 909ef05..d1dbe57 100644 --- a/src/providers/ipa/ipa_selinux.c +++ b/src/providers/ipa/ipa_selinux.c @@ -612,7 +612,8 @@ ipa_get_selinux_maps_offline(struct tevent_req *req) } ret = sysdb_attrs_add_string(state->defaults, - IPA_CONFIG_SELINUX_DEFAULT_MAP, default_user); + IPA_CONFIG_SELINUX_DEFAULT_USER_CTX, + default_user); if (ret != EOK) { return ret; } @@ -856,7 +857,8 @@ ipa_get_selinux_recv(struct tevent_req *req, TEVENT_REQ_RETURN_ON_ERROR(req); if (state->defaults != NULL) { - ret = sysdb_attrs_get_string(state->defaults, IPA_CONFIG_SELINUX_DEFAULT_MAP, + ret = sysdb_attrs_get_string(state->defaults, + IPA_CONFIG_SELINUX_DEFAULT_USER_CTX, &tmp_str); if (ret != EOK && ret != ENOENT) { return ret;