>From cdaa2816471746d5aec54b5acbef5382631cc9bc Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 22 Jul 2014 10:01:03 +0200 Subject: [PATCH 6/7] LDAP: Remove unused option ldap_group_uuid --- src/config/SSSDConfig/__init__.py.in | 1 - src/config/SSSDConfig/sssd_upgrade_config.py | 1 - src/config/etc/sssd.api.d/sssd-ad.conf | 1 - src/config/etc/sssd.api.d/sssd-ipa.conf | 1 - src/config/etc/sssd.api.d/sssd-ldap.conf | 1 - src/man/sssd-ldap.5.xml | 13 ------------- src/providers/ad/ad_opts.h | 1 - src/providers/ipa/ipa_opts.h | 1 - src/providers/ldap/ldap_opts.h | 4 ---- src/providers/ldap/sdap.h | 1 - 10 files changed, 25 deletions(-) diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index a1c33e43bb717457c6533817ad7a894a70e0da17..1bf2e6ff3293f48a62f6255d8c230f9ce6619919 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -290,7 +290,6 @@ option_strings = { 'ldap_group_pwd' : _('Group password'), 'ldap_group_gid_number' : _('GID attribute'), 'ldap_group_member' : _('Group member attribute'), - 'ldap_group_uuid' : _('Group UUID attribute'), 'ldap_group_objectsid' : _("objectSID attribute"), 'ldap_group_modify_timestamp' : _('Modification time attribute for groups'), 'ldap_group_type' : _('Type of the group and other flags'), diff --git a/src/config/SSSDConfig/sssd_upgrade_config.py b/src/config/SSSDConfig/sssd_upgrade_config.py index 33d9fed74424a7d3ee28e888aaed724d0a8a94ff..97be6543f8f86eb0189843003f675d2efcfcc8a5 100644 --- a/src/config/SSSDConfig/sssd_upgrade_config.py +++ b/src/config/SSSDConfig/sssd_upgrade_config.py @@ -184,7 +184,6 @@ class SSSDConfigFile(SSSDChangeConf): 'ldap_group_pwd' : 'userPassword', 'ldap_group_gid_number' : 'groupGidNumber', 'ldap_group_member' : 'groupMember', - 'ldap_group_uuid' : 'groupUUID', 'ldap_group_modify_timestamp' : 'modifyTimestamp', 'ldap_network_timeout' : 'network_timeout', 'ldap_offline_timeout' : 'offline_timeout', diff --git a/src/config/etc/sssd.api.d/sssd-ad.conf b/src/config/etc/sssd.api.d/sssd-ad.conf index 74ca49ab94c4824ecef0e7481243003c2c27cd35..9a9ed0f28d41adf25888eed24d035ecb1d4ef7d5 100644 --- a/src/config/etc/sssd.api.d/sssd-ad.conf +++ b/src/config/etc/sssd.api.d/sssd-ad.conf @@ -89,7 +89,6 @@ ldap_group_object_class = str, None, false ldap_group_name = str, None, false ldap_group_gid_number = str, None, false ldap_group_member = str, None, false -ldap_group_uuid = str, None, false ldap_group_objectsid = str, None, false ldap_group_modify_timestamp = str, None, false ldap_group_entry_usn = str, None, false diff --git a/src/config/etc/sssd.api.d/sssd-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf index ff52e469e08bc7ed8ca59e38a1403135b424f8db..b4532eeb585302d10fc2fbb2eb92cab895f800d6 100644 --- a/src/config/etc/sssd.api.d/sssd-ipa.conf +++ b/src/config/etc/sssd.api.d/sssd-ipa.conf @@ -95,7 +95,6 @@ ldap_group_object_class = str, None, false ldap_group_name = str, None, false ldap_group_gid_number = str, None, false ldap_group_member = str, None, false -ldap_group_uuid = str, None, false ldap_group_objectsid = str, None, false ldap_group_modify_timestamp = str, None, false ldap_group_entry_usn = str, None, false diff --git a/src/config/etc/sssd.api.d/sssd-ldap.conf b/src/config/etc/sssd.api.d/sssd-ldap.conf index 0012622cf13985346a2beac59aafc8cc02f4df8c..e14acf5b703ab4487d9b12c59a0531da763272e6 100644 --- a/src/config/etc/sssd.api.d/sssd-ldap.conf +++ b/src/config/etc/sssd.api.d/sssd-ldap.conf @@ -90,7 +90,6 @@ ldap_group_object_class = str, None, false ldap_group_name = str, None, false ldap_group_gid_number = str, None, false ldap_group_member = str, None, false -ldap_group_uuid = str, None, false ldap_group_objectsid = str, None, false ldap_group_modify_timestamp = str, None, false ldap_group_entry_usn = str, None, false diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index d9b5722074b960ea49c6843520a75ba9a1b53cb4..843c90bdfe8901c16f80905560da68de32903822 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -856,19 +856,6 @@ - ldap_group_uuid (string) - - - The LDAP attribute that contains the UUID/GUID of - an LDAP group object. - - - Default: nsUniqueId - - - - - ldap_group_objectsid (string) diff --git a/src/providers/ad/ad_opts.h b/src/providers/ad/ad_opts.h index 7eb03bd38b38a550fa89d386ba1925457ba5f048..53ec4a149cf4c3c463548da7b0650ecff8d27584 100644 --- a/src/providers/ad/ad_opts.h +++ b/src/providers/ad/ad_opts.h @@ -210,7 +210,6 @@ struct sdap_attr_map ad_2008r2_group_map[] = { { "ldap_group_pwd", NULL, SYSDB_PWD, NULL }, { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "member", SYSDB_MEMBER, NULL }, - { "ldap_group_uuid", "objectGUID", SYSDB_UUID, NULL }, { "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL }, { "ldap_group_modify_timestamp", "whenChanged", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_group_entry_usn", SDAP_AD_USN, SYSDB_USN, NULL }, diff --git a/src/providers/ipa/ipa_opts.h b/src/providers/ipa/ipa_opts.h index 2d67b683f4092735a7ace8f6c0a687c9451febdc..b3f8d14bace785a75a5db7d911dd1a47bf46a1b5 100644 --- a/src/providers/ipa/ipa_opts.h +++ b/src/providers/ipa/ipa_opts.h @@ -209,7 +209,6 @@ struct sdap_attr_map ipa_group_map[] = { { "ldap_group_pwd", "userPassword", SYSDB_PWD, NULL }, { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "member", SYSDB_MEMBER, NULL }, - { "ldap_group_uuid", "nsUniqueId", SYSDB_UUID, NULL }, { "ldap_group_objectsid", "ipaNTSecurityIdentifier", SYSDB_SID_STR, NULL }, { "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_group_entry_usn", NULL, SYSDB_USN, NULL }, diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h index c9dec3483401a74cd60122a77957a1f609ea97cb..767e5ca0ee796c2d093ba908ac0a35b0f178cac9 100644 --- a/src/providers/ldap/ldap_opts.h +++ b/src/providers/ldap/ldap_opts.h @@ -187,7 +187,6 @@ struct sdap_attr_map rfc2307_group_map[] = { { "ldap_group_pwd", "userPassword", SYSDB_PWD, NULL }, { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "memberuid", SYSDB_MEMBER, NULL }, - { "ldap_group_uuid", NULL, SYSDB_UUID, NULL }, { "ldap_group_objectsid", NULL, SYSDB_SID, NULL }, { "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_group_entry_usn", NULL, SYSDB_USN, NULL }, @@ -241,8 +240,6 @@ struct sdap_attr_map rfc2307bis_group_map[] = { { "ldap_group_pwd", "userPassword", SYSDB_PWD, NULL }, { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "member", SYSDB_MEMBER, NULL }, - /* FIXME: this is 389ds specific */ - { "ldap_group_uuid", "nsUniqueId", SYSDB_UUID, NULL }, { "ldap_group_objectsid", NULL, SYSDB_SID, NULL }, { "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_group_entry_usn", NULL, SYSDB_USN, NULL }, @@ -295,7 +292,6 @@ struct sdap_attr_map gen_ad2008r2_group_map[] = { { "ldap_group_pwd", NULL, SYSDB_PWD, NULL }, { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "member", SYSDB_MEMBER, NULL }, - { "ldap_group_uuid", "objectGUID", SYSDB_UUID, NULL }, { "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL }, { "ldap_group_modify_timestamp", "whenChanged", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_group_entry_usn", SDAP_AD_USN, SYSDB_USN, NULL }, diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h index 7ef864b5ff278581fdba53cce8391be8b9f0aa11..4de72a5ea7d78c3da52b218f8b7d6250b84b99aa 100644 --- a/src/providers/ldap/sdap.h +++ b/src/providers/ldap/sdap.h @@ -295,7 +295,6 @@ enum sdap_group_attrs { SDAP_AT_GROUP_PWD, SDAP_AT_GROUP_GID, SDAP_AT_GROUP_MEMBER, - SDAP_AT_GROUP_UUID, SDAP_AT_GROUP_OBJECTSID, SDAP_AT_GROUP_MODSTAMP, SDAP_AT_GROUP_USN, -- 1.9.3