>From f58ae4d0a316cd1297668ddb44bf28a255b8402c Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 25 Jul 2014 14:09:32 +0200 Subject: [PATCH 1/3] LDAP: Remove unused option ldap_netgroup_uuid --- src/config/SSSDConfig/__init__.py.in | 1 - src/config/SSSDConfig/sssd_upgrade_config.py | 1 - src/config/etc/sssd.api.d/sssd-ldap.conf | 1 - src/man/sssd-ldap.5.xml | 17 ----------------- src/providers/ad/ad_opts.h | 2 -- src/providers/ldap/ldap_opts.h | 2 -- src/providers/ldap/sdap.h | 1 - 7 files changed, 25 deletions(-) diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 8be6f8db4725aa0bd24d1a31cc7fcd1a8aca6205..f74171be166aac1e5a3a1a10e84aa219196b2687 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -298,7 +298,6 @@ option_strings = { 'ldap_netgroup_name' : _('Netgroup name'), 'ldap_netgroup_member' : _('Netgroups members attribute'), 'ldap_netgroup_triple' : _('Netgroup triple attribute'), - 'ldap_netgroup_uuid' : _('Netgroup UUID attribute'), 'ldap_netgroup_modify_timestamp' : _('Modification time attribute for netgroups'), 'ldap_service_search_base' : _('Base DN for service lookups'), diff --git a/src/config/SSSDConfig/sssd_upgrade_config.py b/src/config/SSSDConfig/sssd_upgrade_config.py index 7e4cbbff45fa7aebb0fcb1d64049441602cdfc43..33d9fed74424a7d3ee28e888aaed724d0a8a94ff 100644 --- a/src/config/SSSDConfig/sssd_upgrade_config.py +++ b/src/config/SSSDConfig/sssd_upgrade_config.py @@ -197,7 +197,6 @@ class SSSDConfigFile(SSSDChangeConf): 'ldap_netgroup_name' : 'netgroupName', 'ldap_netgroup_member' : 'netgroupMember', 'ldap_netgroup_triple' : 'netgroupTriple', - 'ldap_netgroup_uuid' : 'netgroupUUID', 'ldap_netgroup_modify_timestamp' : 'netgroupModifyTimestamp', } krb5_kw = { 'krb5_server' : 'krb5KDCIP', diff --git a/src/config/etc/sssd.api.d/sssd-ldap.conf b/src/config/etc/sssd.api.d/sssd-ldap.conf index ca1dee08de83dbaf55add980f2bf1add3ef29232..ce1ed3fb76e48e74fb5366b817d6958ab671730d 100644 --- a/src/config/etc/sssd.api.d/sssd-ldap.conf +++ b/src/config/etc/sssd.api.d/sssd-ldap.conf @@ -102,7 +102,6 @@ ldap_netgroup_object_class = str, None, false ldap_netgroup_name = str, None, false ldap_netgroup_member = str, None, false ldap_netgroup_triple = str, None, false -ldap_netgroup_uuid = str, None, false ldap_netgroup_modify_timestamp = str, None, false ldap_service_object_class = str, None, false ldap_service_name = str, None, false diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index 01efb29fecc2d7bda1ee0100a28bba61a6568a0b..4656f34fda4cdd12a6c45c0975ed1a8ef6816928 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -1089,23 +1089,6 @@ - ldap_netgroup_uuid (string) - - - The LDAP attribute that contains the UUID/GUID of - an LDAP netgroup object. - - - In IPA provider, ipa_netgroup_uuid should - be used instead. - - - Default: nsUniqueId - - - - - ldap_netgroup_modify_timestamp (string) diff --git a/src/providers/ad/ad_opts.h b/src/providers/ad/ad_opts.h index feb7ba124fbcb5e2f506d157c0efba2722aa24ea..8d705d21317f9a3ccef6d0331d59398925cc6fde 100644 --- a/src/providers/ad/ad_opts.h +++ b/src/providers/ad/ad_opts.h @@ -220,8 +220,6 @@ struct sdap_attr_map ad_netgroup_map[] = { { "ldap_netgroup_name", "cn", SYSDB_NAME, NULL }, { "ldap_netgroup_member", "memberNisNetgroup", SYSDB_ORIG_NETGROUP_MEMBER, NULL }, { "ldap_netgroup_triple", "nisNetgroupTriple", SYSDB_NETGROUP_TRIPLE, NULL }, - /* FIXME: this is 389ds specific */ - { "ldap_netgroup_uuid", "nsUniqueId", SYSDB_UUID, NULL }, { "ldap_netgroup_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, SDAP_ATTR_MAP_TERMINATOR }; diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h index 217436113ec3b66b0e903ad4ddf8911eeb58ae4a..a254da10889b96e2f700e01aed48bc3a5aea9d16 100644 --- a/src/providers/ldap/ldap_opts.h +++ b/src/providers/ldap/ldap_opts.h @@ -306,8 +306,6 @@ struct sdap_attr_map netgroup_map[] = { { "ldap_netgroup_name", "cn", SYSDB_NAME, NULL }, { "ldap_netgroup_member", "memberNisNetgroup", SYSDB_ORIG_NETGROUP_MEMBER, NULL }, { "ldap_netgroup_triple", "nisNetgroupTriple", SYSDB_NETGROUP_TRIPLE, NULL }, - /* FIXME: this is 389ds specific */ - { "ldap_netgroup_uuid", "nsUniqueId", SYSDB_UUID, NULL }, { "ldap_netgroup_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, SDAP_ATTR_MAP_TERMINATOR }; diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h index 178aecce1bf8b51dc8f1931aa07d989b8f31f11d..bcd071426faa4a71eff9958fc24c7d07ee692686 100644 --- a/src/providers/ldap/sdap.h +++ b/src/providers/ldap/sdap.h @@ -308,7 +308,6 @@ enum sdap_netgroup_attrs { SDAP_AT_NETGROUP_NAME, SDAP_AT_NETGROUP_MEMBER, SDAP_AT_NETGROUP_TRIPLE, - SDAP_AT_NETGROUP_UUID, SDAP_AT_NETGROUP_MODSTAMP, SDAP_OPTS_NETGROUP /* attrs counter */ -- 1.9.3