|
 |
905b4d |
From cce184b46a1109d8e1e318b4538ee960ba67619d Mon Sep 17 00:00:00 2001
|
|
|
905b4d |
From: Sumit Bose <sbose@redhat.com>
|
|
|
905b4d |
Date: Wed, 5 Nov 2014 17:38:05 +0100
|
|
|
905b4d |
Subject: [PATCH 77/79] Revert "LDAP: Remove unused option ldap_group_uuid"
|
|
|
905b4d |
MIME-Version: 1.0
|
|
|
905b4d |
Content-Type: text/plain; charset=UTF-8
|
|
|
905b4d |
Content-Transfer-Encoding: 8bit
|
|
|
905b4d |
|
|
|
905b4d |
This reverts commit b5242c146cc0ca96e2b898a74fb060efda15bc77.
|
|
|
905b4d |
|
|
|
905b4d |
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
|
905b4d |
---
|
|
|
905b4d |
src/config/SSSDConfig/__init__.py.in | 1 +
|
|
|
905b4d |
src/config/SSSDConfig/sssd_upgrade_config.py | 1 +
|
|
|
905b4d |
src/config/etc/sssd.api.d/sssd-ad.conf | 1 +
|
|
|
905b4d |
src/config/etc/sssd.api.d/sssd-ipa.conf | 1 +
|
|
|
905b4d |
src/config/etc/sssd.api.d/sssd-ldap.conf | 1 +
|
|
|
905b4d |
src/man/sssd-ldap.5.xml | 13 +++++++++++++
|
|
|
905b4d |
src/providers/ad/ad_opts.h | 1 +
|
|
|
905b4d |
src/providers/ipa/ipa_opts.h | 1 +
|
|
|
905b4d |
src/providers/ldap/ldap_opts.h | 4 ++++
|
|
|
905b4d |
src/providers/ldap/sdap.h | 1 +
|
|
|
905b4d |
10 files changed, 25 insertions(+)
|
|
|
905b4d |
|
|
|
905b4d |
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
|
|
|
905b4d |
index 73195bc46688e14bfdd456f6345e45bdc3d0a8f0..283ed2d37c894db95bac38c23d25c4ac8d1f4a40 100644
|
|
|
905b4d |
--- a/src/config/SSSDConfig/__init__.py.in
|
|
|
905b4d |
+++ b/src/config/SSSDConfig/__init__.py.in
|
|
|
905b4d |
@@ -309,6 +309,7 @@ option_strings = {
|
|
|
905b4d |
'ldap_group_pwd' : _('Group password'),
|
|
|
905b4d |
'ldap_group_gid_number' : _('GID attribute'),
|
|
|
905b4d |
'ldap_group_member' : _('Group member attribute'),
|
|
|
905b4d |
+ 'ldap_group_uuid' : _('Group UUID attribute'),
|
|
|
905b4d |
'ldap_group_objectsid' : _("objectSID attribute"),
|
|
|
905b4d |
'ldap_group_modify_timestamp' : _('Modification time attribute for groups'),
|
|
|
905b4d |
'ldap_group_type' : _('Type of the group and other flags'),
|
|
|
905b4d |
diff --git a/src/config/SSSDConfig/sssd_upgrade_config.py b/src/config/SSSDConfig/sssd_upgrade_config.py
|
|
|
905b4d |
index 97be6543f8f86eb0189843003f675d2efcfcc8a5..33d9fed74424a7d3ee28e888aaed724d0a8a94ff 100644
|
|
|
905b4d |
--- a/src/config/SSSDConfig/sssd_upgrade_config.py
|
|
|
905b4d |
+++ b/src/config/SSSDConfig/sssd_upgrade_config.py
|
|
|
905b4d |
@@ -184,6 +184,7 @@ class SSSDConfigFile(SSSDChangeConf):
|
|
|
905b4d |
'ldap_group_pwd' : 'userPassword',
|
|
|
905b4d |
'ldap_group_gid_number' : 'groupGidNumber',
|
|
|
905b4d |
'ldap_group_member' : 'groupMember',
|
|
|
905b4d |
+ 'ldap_group_uuid' : 'groupUUID',
|
|
|
905b4d |
'ldap_group_modify_timestamp' : 'modifyTimestamp',
|
|
|
905b4d |
'ldap_network_timeout' : 'network_timeout',
|
|
|
905b4d |
'ldap_offline_timeout' : 'offline_timeout',
|
|
|
905b4d |
diff --git a/src/config/etc/sssd.api.d/sssd-ad.conf b/src/config/etc/sssd.api.d/sssd-ad.conf
|
|
|
905b4d |
index f8b200eaaf2f1b2ee17214faf2df70b14a2ec93c..3daa2560b14d74f7686ed47cf1b09e2005eb8917 100644
|
|
|
905b4d |
--- a/src/config/etc/sssd.api.d/sssd-ad.conf
|
|
|
905b4d |
+++ b/src/config/etc/sssd.api.d/sssd-ad.conf
|
|
|
905b4d |
@@ -98,6 +98,7 @@ ldap_group_object_class = str, None, false
|
|
|
905b4d |
ldap_group_name = str, None, false
|
|
|
905b4d |
ldap_group_gid_number = str, None, false
|
|
|
905b4d |
ldap_group_member = str, None, false
|
|
|
905b4d |
+ldap_group_uuid = str, None, false
|
|
|
905b4d |
ldap_group_objectsid = str, None, false
|
|
|
905b4d |
ldap_group_modify_timestamp = str, None, false
|
|
|
905b4d |
ldap_group_entry_usn = str, None, false
|
|
|
905b4d |
diff --git a/src/config/etc/sssd.api.d/sssd-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf
|
|
|
905b4d |
index 91dc9ec9d158758be32f8a3eb5d36be2446fc254..5df52581e67657e41e2f08820b885f100ccd7ca9 100644
|
|
|
905b4d |
--- a/src/config/etc/sssd.api.d/sssd-ipa.conf
|
|
|
905b4d |
+++ b/src/config/etc/sssd.api.d/sssd-ipa.conf
|
|
|
905b4d |
@@ -95,6 +95,7 @@ ldap_group_object_class = str, None, false
|
|
|
905b4d |
ldap_group_name = str, None, false
|
|
|
905b4d |
ldap_group_gid_number = str, None, false
|
|
|
905b4d |
ldap_group_member = str, None, false
|
|
|
905b4d |
+ldap_group_uuid = str, None, false
|
|
|
905b4d |
ldap_group_objectsid = str, None, false
|
|
|
905b4d |
ldap_group_modify_timestamp = str, None, false
|
|
|
905b4d |
ldap_group_entry_usn = str, None, false
|
|
|
905b4d |
diff --git a/src/config/etc/sssd.api.d/sssd-ldap.conf b/src/config/etc/sssd.api.d/sssd-ldap.conf
|
|
|
905b4d |
index 68d5b4953a07398b159f3374ccba7380a642d818..ba5f56f1942da552fc6ab8f82851714756683a8f 100644
|
|
|
905b4d |
--- a/src/config/etc/sssd.api.d/sssd-ldap.conf
|
|
|
905b4d |
+++ b/src/config/etc/sssd.api.d/sssd-ldap.conf
|
|
|
905b4d |
@@ -90,6 +90,7 @@ ldap_group_object_class = str, None, false
|
|
|
905b4d |
ldap_group_name = str, None, false
|
|
|
905b4d |
ldap_group_gid_number = str, None, false
|
|
|
905b4d |
ldap_group_member = str, None, false
|
|
|
905b4d |
+ldap_group_uuid = str, None, false
|
|
|
905b4d |
ldap_group_objectsid = str, None, false
|
|
|
905b4d |
ldap_group_modify_timestamp = str, None, false
|
|
|
905b4d |
ldap_group_entry_usn = str, None, false
|
|
|
905b4d |
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
|
|
|
905b4d |
index 24bc34d3b9ca7a93b241a14ef712d4187306a347..f45522bd5f6c599bce7a38d8821cb0a08f6b5df3 100644
|
|
|
905b4d |
--- a/src/man/sssd-ldap.5.xml
|
|
|
905b4d |
+++ b/src/man/sssd-ldap.5.xml
|
|
|
905b4d |
@@ -859,6 +859,19 @@
|
|
|
905b4d |
</varlistentry>
|
|
|
905b4d |
|
|
|
905b4d |
<varlistentry>
|
|
|
905b4d |
+ <term>ldap_group_uuid (string)</term>
|
|
|
905b4d |
+ <listitem>
|
|
|
905b4d |
+ <para>
|
|
|
905b4d |
+ The LDAP attribute that contains the UUID/GUID of
|
|
|
905b4d |
+ an LDAP group object.
|
|
|
905b4d |
+ </para>
|
|
|
905b4d |
+ <para>
|
|
|
905b4d |
+ Default: nsUniqueId
|
|
|
905b4d |
+ </para>
|
|
|
905b4d |
+ </listitem>
|
|
|
905b4d |
+ </varlistentry>
|
|
|
905b4d |
+
|
|
|
905b4d |
+ <varlistentry>
|
|
|
905b4d |
<term>ldap_group_objectsid (string)</term>
|
|
|
905b4d |
<listitem>
|
|
|
905b4d |
<para>
|
|
|
905b4d |
diff --git a/src/providers/ad/ad_opts.h b/src/providers/ad/ad_opts.h
|
|
|
905b4d |
index ee70b3c4b71b87ab31ac07310a448d7960f8e9a8..ac6006c9200464956ccedb17ff53050fed5fc6ea 100644
|
|
|
905b4d |
--- a/src/providers/ad/ad_opts.h
|
|
|
905b4d |
+++ b/src/providers/ad/ad_opts.h
|
|
|
905b4d |
@@ -221,6 +221,7 @@ struct sdap_attr_map ad_2008r2_group_map[] = {
|
|
|
905b4d |
{ "ldap_group_pwd", NULL, SYSDB_PWD, NULL },
|
|
|
905b4d |
{ "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL },
|
|
|
905b4d |
{ "ldap_group_member", "member", SYSDB_MEMBER, NULL },
|
|
|
905b4d |
+ { "ldap_group_uuid", "objectGUID", SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL },
|
|
|
905b4d |
{ "ldap_group_modify_timestamp", "whenChanged", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
{ "ldap_group_entry_usn", SDAP_AD_USN, SYSDB_USN, NULL },
|
|
|
905b4d |
diff --git a/src/providers/ipa/ipa_opts.h b/src/providers/ipa/ipa_opts.h
|
|
|
905b4d |
index 3fe858ca384015b3ffabe7ce391fa51089354719..e0478db39913b87c071d8f4daf9c2a0b33a0b0f4 100644
|
|
|
905b4d |
--- a/src/providers/ipa/ipa_opts.h
|
|
|
905b4d |
+++ b/src/providers/ipa/ipa_opts.h
|
|
|
905b4d |
@@ -212,6 +212,7 @@ struct sdap_attr_map ipa_group_map[] = {
|
|
|
905b4d |
{ "ldap_group_pwd", "userPassword", SYSDB_PWD, NULL },
|
|
|
905b4d |
{ "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL },
|
|
|
905b4d |
{ "ldap_group_member", "member", SYSDB_MEMBER, NULL },
|
|
|
905b4d |
+ { "ldap_group_uuid", "nsUniqueId", SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_group_objectsid", "ipaNTSecurityIdentifier", SYSDB_SID_STR, NULL },
|
|
|
905b4d |
{ "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
{ "ldap_group_entry_usn", NULL, SYSDB_USN, NULL },
|
|
|
905b4d |
diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h
|
|
|
905b4d |
index 2e937412635e16b4bc541c59055b1c4e7896f045..096a63bd53918ba79378c01257a18e543597209a 100644
|
|
|
905b4d |
--- a/src/providers/ldap/ldap_opts.h
|
|
|
905b4d |
+++ b/src/providers/ldap/ldap_opts.h
|
|
|
905b4d |
@@ -189,6 +189,7 @@ struct sdap_attr_map rfc2307_group_map[] = {
|
|
|
905b4d |
{ "ldap_group_pwd", "userPassword", SYSDB_PWD, NULL },
|
|
|
905b4d |
{ "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL },
|
|
|
905b4d |
{ "ldap_group_member", "memberuid", SYSDB_MEMBER, NULL },
|
|
|
905b4d |
+ { "ldap_group_uuid", NULL, SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL },
|
|
|
905b4d |
{ "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
{ "ldap_group_entry_usn", NULL, SYSDB_USN, NULL },
|
|
|
905b4d |
@@ -243,6 +244,8 @@ struct sdap_attr_map rfc2307bis_group_map[] = {
|
|
|
905b4d |
{ "ldap_group_pwd", "userPassword", SYSDB_PWD, NULL },
|
|
|
905b4d |
{ "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL },
|
|
|
905b4d |
{ "ldap_group_member", "member", SYSDB_MEMBER, NULL },
|
|
|
905b4d |
+ /* FIXME: this is 389ds specific */
|
|
|
905b4d |
+ { "ldap_group_uuid", "nsUniqueId", SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL },
|
|
|
905b4d |
{ "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
{ "ldap_group_entry_usn", NULL, SYSDB_USN, NULL },
|
|
|
905b4d |
@@ -296,6 +299,7 @@ struct sdap_attr_map gen_ad2008r2_group_map[] = {
|
|
|
905b4d |
{ "ldap_group_pwd", NULL, SYSDB_PWD, NULL },
|
|
|
905b4d |
{ "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL },
|
|
|
905b4d |
{ "ldap_group_member", "member", SYSDB_MEMBER, NULL },
|
|
|
905b4d |
+ { "ldap_group_uuid", "objectGUID", SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL },
|
|
|
905b4d |
{ "ldap_group_modify_timestamp", "whenChanged", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
{ "ldap_group_entry_usn", SDAP_AD_USN, SYSDB_USN, NULL },
|
|
|
905b4d |
diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
|
|
|
905b4d |
index 906fd74090509802909b300d26234f96d324a769..aa10623a58d7d667205b09e744dc2b924ca821ed 100644
|
|
|
905b4d |
--- a/src/providers/ldap/sdap.h
|
|
|
905b4d |
+++ b/src/providers/ldap/sdap.h
|
|
|
905b4d |
@@ -295,6 +295,7 @@ enum sdap_group_attrs {
|
|
|
905b4d |
SDAP_AT_GROUP_PWD,
|
|
|
905b4d |
SDAP_AT_GROUP_GID,
|
|
|
905b4d |
SDAP_AT_GROUP_MEMBER,
|
|
|
905b4d |
+ SDAP_AT_GROUP_UUID,
|
|
|
905b4d |
SDAP_AT_GROUP_OBJECTSID,
|
|
|
905b4d |
SDAP_AT_GROUP_MODSTAMP,
|
|
|
905b4d |
SDAP_AT_GROUP_USN,
|
|
|
905b4d |
--
|
|
|
905b4d |
1.9.3
|
|
|
905b4d |
|