>From 8ef97d53dbe2198874e19154268fe874123b57d5 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 22 Jul 2014 10:11:34 +0200 Subject: [PATCH 3/7] LDAP: Remove unused option {ipa,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-ipa.conf | 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/ipa/ipa_common.h | 1 - src/providers/ipa/ipa_opts.h | 1 - src/providers/ldap/ldap_opts.h | 2 -- src/providers/ldap/sdap.h | 1 - 10 files changed, 28 deletions(-) diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 439378ff86d07311f67d51ed775e2d973cd93869..a1c33e43bb717457c6533817ad7a894a70e0da17 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -302,7 +302,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-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf index 016f0320be2dcdb449b72edffe8a33cd314914f2..97ef15d587c02f04dd6b0ee4297fbd3e7d993aa9 100644 --- a/src/config/etc/sssd.api.d/sssd-ipa.conf +++ b/src/config/etc/sssd.api.d/sssd-ipa.conf @@ -111,7 +111,6 @@ ipa_netgroup_member_user = str, None, false ipa_netgroup_member_host = str, None, false ipa_netgroup_member_ext_host = str, None, false ipa_netgroup_domain = str, None, false -ipa_netgroup_uuid = str, None, false ldap_service_object_class = str, None, false ldap_service_name = str, None, false ldap_service_port = 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 c1c030976f7ba4c20fd34c72117f11bb6950e270..0012622cf13985346a2beac59aafc8cc02f4df8c 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 7b5ee34705c180075e573c11de4553cb2658cd28..d9b5722074b960ea49c6843520a75ba9a1b53cb4 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 b80aaddf29b7fb236d89bfb4e148bba7aeeecd14..7eb03bd38b38a550fa89d386ba1925457ba5f048 100644 --- a/src/providers/ad/ad_opts.h +++ b/src/providers/ad/ad_opts.h @@ -223,8 +223,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/ipa/ipa_common.h b/src/providers/ipa/ipa_common.h index d7630a5f7434aa07368061b430d45e2a1be757b6..5058be005586ac885d5207400b47938928115534 100644 --- a/src/providers/ipa/ipa_common.h +++ b/src/providers/ipa/ipa_common.h @@ -66,7 +66,6 @@ enum ipa_netgroup_attrs { IPA_AT_NETGROUP_MEMBER_HOST, IPA_AT_NETGROUP_EXTERNAL_HOST, IPA_AT_NETGROUP_DOMAIN, - IPA_AT_NETGROUP_UUID, IPA_OPTS_NETGROUP /* attrs counter */ }; diff --git a/src/providers/ipa/ipa_opts.h b/src/providers/ipa/ipa_opts.h index 4f77621f856be2a1d34c40e324befa3528bc4440..215c2eddb4cadc7af55162909e4ad9c55087fd4b 100644 --- a/src/providers/ipa/ipa_opts.h +++ b/src/providers/ipa/ipa_opts.h @@ -226,7 +226,6 @@ struct sdap_attr_map ipa_netgroup_map[] = { { "ipa_netgroup_member_host", "memberHost", SYSDB_ORIG_MEMBER_HOST, NULL }, { "ipa_netgroup_member_ext_host", "externalHost", SYSDB_ORIG_NETGROUP_EXTERNAL_HOST, NULL }, { "ipa_netgroup_domain", "nisDomainName", SYSDB_NETGROUP_DOMAIN, NULL }, - { "ipa_netgroup_uuid", "ipaUniqueID", SYSDB_UUID, NULL }, SDAP_ATTR_MAP_TERMINATOR }; diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h index 39c24733261e744aaff2954dad56c2609122bf49..c9dec3483401a74cd60122a77957a1f609ea97cb 100644 --- a/src/providers/ldap/ldap_opts.h +++ b/src/providers/ldap/ldap_opts.h @@ -308,8 +308,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 87f2131ae6e8eea68e4db81b7de6e70a4c0636a7..7ef864b5ff278581fdba53cce8391be8b9f0aa11 100644 --- a/src/providers/ldap/sdap.h +++ b/src/providers/ldap/sdap.h @@ -309,7 +309,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