LDAP: Remove unused option ldap_netgroup_uuid

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
(cherry picked from commit 87ff519b472568b19809963ca860d2182e874fcd)

7 files changed, 0 insertions, 25 deletions

diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index 8be6f8db4..f74171be1 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 7e4cbbff4..33d9fed74 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 ca1dee08d..ce1ed3fb7 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 01efb29fe..4656f34fd 100644
--- a/src/man/sssd-ldap.5.xml
+++ b/src/man/sssd-ldap.5.xml
@@ -1089,23 +1089,6 @@
                 </varlistentry>
 
                 <varlistentry>
-                    <term>ldap_netgroup_uuid (string)</term>
-                    <listitem>
-                        <para>
-                            The LDAP attribute that contains the UUID/GUID of
-                            an LDAP netgroup object.
-                        </para>
-                        <para>
-                            In IPA provider, ipa_netgroup_uuid should
-                            be used instead.
-                        </para>
-                        <para>
-                            Default: nsUniqueId
-                        </para>
-                    </listitem>
-                </varlistentry>
-
-                <varlistentry>
                     <term>ldap_netgroup_modify_timestamp (string)</term>
                     <listitem>
                         <para>
diff --git a/src/providers/ad/ad_opts.h b/src/providers/ad/ad_opts.h
index feb7ba124..8d705d213 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 217436113..a254da108 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 178aecce1..bcd071426 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 */