From 352f4832324839d358235de1236090b1fd4ddc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Genz?= Date: Tue, 25 Apr 2017 20:33:58 +0000 Subject: [PATCH 131/135] Use correct spelling of override Reviewed-by: Jakub Hrozek --- src/config/SSSDConfig/__init__.py.in | 2 +- src/config/cfg_rules.ini | 2 +- src/config/etc/sssd.api.d/sssd-ipa.conf | 2 +- src/db/sysdb_views.c | 6 +++--- src/man/sssd-ipa.5.xml | 2 +- src/providers/ipa/ipa_opts.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 54ad722f07ef91a13a0df278ffd2b1c166bc8d36..5ca31cfefccbb09438d261d4287cd8db736d348e 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -211,7 +211,7 @@ option_strings = { 'ipa_views_search_base': _("Search base for view containers"), 'ipa_view_class': _("Objectclass for view containers"), 'ipa_view_name': _("Attribute with the name of the view"), - 'ipa_overide_object_class': _("Objectclass for override objects"), + 'ipa_override_object_class': _("Objectclass for override objects"), 'ipa_anchor_uuid': _("Attribute with the reference to the original object"), 'ipa_user_override_object_class': _("Objectclass for user override objects"), 'ipa_group_override_object_class': _("Objectclass for group override objects"), diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini index e47ff33242d6a9e5979fe0eb8eea14c2af28685a..64cb1474fadba5d5372470a17cd9cd7c7cec7835 100644 --- a/src/config/cfg_rules.ini +++ b/src/config/cfg_rules.ini @@ -457,7 +457,7 @@ option = ipa_netgroup_member_user option = ipa_netgroup_name option = ipa_netgroup_object_class option = ipa_netgroup_uuid -option = ipa_overide_object_class +option = ipa_override_object_class option = ipa_ranges_search_base option = ipa_selinux_refresh option = ipa_selinux_usermap_enabled diff --git a/src/config/etc/sssd.api.d/sssd-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf index 88da36ef4a0a067530dfd44b7a231f4f74c800f2..f36b568c3ea813db3f46fdd69059957f6373801e 100644 --- a/src/config/etc/sssd.api.d/sssd-ipa.conf +++ b/src/config/etc/sssd.api.d/sssd-ipa.conf @@ -143,7 +143,7 @@ ldap_pwdlockout_dn = str, None, false ipa_views_search_base = str, None, false ipa_view_class = str, None, false ipa_view_name = str, None, false -ipa_overide_object_class = str, None, false +ipa_override_object_class = str, None, false ipa_anchor_uuid = str, None, false ipa_user_override_object_class = str, None, false ipa_group_override_object_class = str, None, false diff --git a/src/db/sysdb_views.c b/src/db/sysdb_views.c index 3773dda77e16b35fa217be0aa7974da7e34c09f4..afc7852ecf402ef144beca9c1b94fbe3cc4bbb6a 100644 --- a/src/db/sysdb_views.c +++ b/src/db/sysdb_views.c @@ -521,7 +521,7 @@ errno_t sysdb_store_override(struct sss_domain_info *domain, NULL); if (obj_override_dn != NULL) { /* obj_override_dn can either point to the object itself, i.e there is - * no override, or to a overide object. This means it can change from + * no override, or to a override object. This means it can change from * the object DN to a override DN and back but not from one override * DN to a different override DN. If the new and the old DN are the * same we do not need to update the original object. */ @@ -931,7 +931,7 @@ done: #define SYSDB_USER_NAME_OVERRIDE_FILTER "(&(objectClass="SYSDB_OVERRIDE_USER_CLASS")(|("SYSDB_NAME_ALIAS"=%s)("SYSDB_NAME_ALIAS"=%s)("SYSDB_NAME"=%s)))" #define SYSDB_USER_UID_OVERRIDE_FILTER "(&(objectClass="SYSDB_OVERRIDE_USER_CLASS")("SYSDB_UIDNUM"=%lu))" -#define SYSDB_USER_CERT_OVERIDE_FILTER "(&(objectClass="SYSDB_OVERRIDE_USER_CLASS")%s)" +#define SYSDB_USER_CERT_OVERRIDE_FILTER "(&(objectClass="SYSDB_OVERRIDE_USER_CLASS")%s)" #define SYSDB_GROUP_NAME_OVERRIDE_FILTER "(&(objectClass="SYSDB_OVERRIDE_GROUP_CLASS")(|("SYSDB_NAME_ALIAS"=%s)("SYSDB_NAME_ALIAS"=%s)("SYSDB_NAME"=%s)))" #define SYSDB_GROUP_GID_OVERRIDE_FILTER "(&(objectClass="SYSDB_OVERRIDE_GROUP_CLASS")("SYSDB_GIDNUM"=%lu))" @@ -978,7 +978,7 @@ errno_t sysdb_search_override_by_cert(TALLOC_CTX *mem_ctx, } ret = ldb_search(domain->sysdb->ldb, tmp_ctx, &override_res, base_dn, - LDB_SCOPE_SUBTREE, attrs, SYSDB_USER_CERT_OVERIDE_FILTER, + LDB_SCOPE_SUBTREE, attrs, SYSDB_USER_CERT_OVERRIDE_FILTER, cert_filter); if (ret != LDB_SUCCESS) { ret = sysdb_error_to_errno(ret); diff --git a/src/man/sssd-ipa.5.xml b/src/man/sssd-ipa.5.xml index fee644186c9ed11eee18cd27450e56aea38d05bf..98db5b96d9abf157440440eab0882e49595efa5f 100644 --- a/src/man/sssd-ipa.5.xml +++ b/src/man/sssd-ipa.5.xml @@ -546,7 +546,7 @@ - ipa_overide_object_class (string) + ipa_override_object_class (string) Objectclass of the override objects. diff --git a/src/providers/ipa/ipa_opts.c b/src/providers/ipa/ipa_opts.c index cd3fe9ae4302ff4837a500b9a0c834dadb11f87d..f9f3a2a6992be6cf5cb3c699b30c45ca9dbb42ab 100644 --- a/src/providers/ipa/ipa_opts.c +++ b/src/providers/ipa/ipa_opts.c @@ -277,7 +277,7 @@ struct sdap_attr_map ipa_view_map[] = { }; struct sdap_attr_map ipa_override_map[] = { - { "ipa_overide_object_class", "ipaOverrideAnchor", SYSDB_OVERRIDE_CLASS, NULL}, + { "ipa_override_object_class", "ipaOverrideAnchor", SYSDB_OVERRIDE_CLASS, NULL}, { "ipa_anchor_uuid", "ipaAnchorUUID", SYSDB_OVERRIDE_ANCHOR_UUID, NULL}, { "ipa_user_override_object_class", "ipaUserOverride", SYSDB_OVERRIDE_USER_CLASS, NULL}, { "ipa_group_override_object_class", "ipaGroupOverride", SYSDB_OVERRIDE_GROUP_CLASS, NULL}, -- 2.12.2