>From 433a697db906de28021eebd76a968459b648e6ed Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 22 Jul 2014 10:27:34 +0200 Subject: [PATCH 2/7] LDAP: Remove unused option ipa_selinux_usermap_uuid --- src/config/etc/sssd.api.d/sssd-ipa.conf | 1 - src/providers/ipa/ipa_common.h | 1 - src/providers/ipa/ipa_opts.h | 1 - 3 files changed, 3 deletions(-) diff --git a/src/config/etc/sssd.api.d/sssd-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf index 7529df4cfa73e51ad4f6b7ce5798f9a26caec9f8..016f0320be2dcdb449b72edffe8a33cd314914f2 100644 --- a/src/config/etc/sssd.api.d/sssd-ipa.conf +++ b/src/config/etc/sssd.api.d/sssd-ipa.conf @@ -192,7 +192,6 @@ ipa_selinux_usermap_selinux_user = str, None, false ipa_selinux_usermap_enabled = str, None, false ipa_selinux_usermap_user_category = str, None, false ipa_selinux_usermap_host_category = str, None, false -ipa_selinux_usermap_uuid = str, None, false [provider/ipa/hostid] diff --git a/src/providers/ipa/ipa_common.h b/src/providers/ipa/ipa_common.h index 65288b6f8a44894dfd770c35bc92b3946c5a421d..d7630a5f7434aa07368061b430d45e2a1be757b6 100644 --- a/src/providers/ipa/ipa_common.h +++ b/src/providers/ipa/ipa_common.h @@ -101,7 +101,6 @@ enum ipa_selinux_usermap_attrs { IPA_AT_SELINUX_USERMAP_ENABLED, IPA_AT_SELINUX_USERMAP_USERCAT, IPA_AT_SELINUX_USERMAP_HOSTCAT, - IPA_AT_SELINUX_USERMAP_UUID, IPA_OPTS_SELINUX_USERMAP /* attrs counter */ }; diff --git a/src/providers/ipa/ipa_opts.h b/src/providers/ipa/ipa_opts.h index ab729f524e8a6b1ecd8cc1d239b49dca605e8eb1..4f77621f856be2a1d34c40e324befa3528bc4440 100644 --- a/src/providers/ipa/ipa_opts.h +++ b/src/providers/ipa/ipa_opts.h @@ -258,7 +258,6 @@ struct sdap_attr_map ipa_selinux_user_map[] = { { "ipa_selinux_usermap_enabled", "ipaEnabledFlag", SYSDB_SELINUX_ENABLED, NULL}, { "ipa_selinux_usermap_user_category", "userCategory", SYSDB_USER_CATEGORY, NULL}, { "ipa_selinux_usermap_host_category", "hostCategory", SYSDB_HOST_CATEGORY, NULL}, - { "ipa_selinux_usermap_uuid", "ipaUniqueID", SYSDB_UUID, NULL}, SDAP_ATTR_MAP_TERMINATOR }; -- 1.9.3