|
 |
905b4d |
From 60720e16c292cd944677a675728d11d405d8885d Mon Sep 17 00:00:00 2001
|
|
|
905b4d |
From: Sumit Bose <sbose@redhat.com>
|
|
|
905b4d |
Date: Wed, 5 Nov 2014 17:35:45 +0100
|
|
|
905b4d |
Subject: [PATCH 76/79] Revert "LDAP: Remove unused option ldap_user_uuid"
|
|
|
905b4d |
MIME-Version: 1.0
|
|
|
905b4d |
Content-Type: text/plain; charset=UTF-8
|
|
|
905b4d |
Content-Transfer-Encoding: 8bit
|
|
|
905b4d |
|
|
|
905b4d |
This reverts commit dfb2960ab251f609466fa660449703835c97f99a.
|
|
|
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 b4560ea2b33f2c3b82bff42fb6a36302a146c99f..73195bc46688e14bfdd456f6345e45bdc3d0a8f0 100644
|
|
|
905b4d |
--- a/src/config/SSSDConfig/__init__.py.in
|
|
|
905b4d |
+++ b/src/config/SSSDConfig/__init__.py.in
|
|
|
905b4d |
@@ -272,6 +272,7 @@ option_strings = {
|
|
|
905b4d |
'ldap_user_gecos' : _('GECOS attribute'),
|
|
|
905b4d |
'ldap_user_home_directory' : _('Home directory attribute'),
|
|
|
905b4d |
'ldap_user_shell' : _('Shell attribute'),
|
|
|
905b4d |
+ 'ldap_user_uuid' : _('UUID attribute'),
|
|
|
905b4d |
'ldap_user_objectsid' : _("objectSID attribute"),
|
|
|
905b4d |
'ldap_user_primary_group' : _('Active Directory primary group attribute for ID-mapping'),
|
|
|
905b4d |
'ldap_user_principal' : _('User principal attribute (for Kerberos)'),
|
|
|
905b4d |
diff --git a/src/config/SSSDConfig/sssd_upgrade_config.py b/src/config/SSSDConfig/sssd_upgrade_config.py
|
|
|
905b4d |
index 3d9f788c3b4707a8b6e8958d11d5068437d31156..97be6543f8f86eb0189843003f675d2efcfcc8a5 100644
|
|
|
905b4d |
--- a/src/config/SSSDConfig/sssd_upgrade_config.py
|
|
|
905b4d |
+++ b/src/config/SSSDConfig/sssd_upgrade_config.py
|
|
|
905b4d |
@@ -170,6 +170,7 @@ class SSSDConfigFile(SSSDChangeConf):
|
|
|
905b4d |
'ldap_user_gecos' : 'userGecos',
|
|
|
905b4d |
'ldap_user_home_directory' : 'userHomeDirectory',
|
|
|
905b4d |
'ldap_user_shell' : 'userShell',
|
|
|
905b4d |
+ 'ldap_user_uuid' : 'userUUID',
|
|
|
905b4d |
'ldap_user_principal' : 'userPrincipal',
|
|
|
905b4d |
'ldap_force_upper_case_realm' : 'force_upper_case_realm',
|
|
|
905b4d |
'ldap_user_fullname' : 'userFullname',
|
|
|
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 5dd4fb43526849e6b74fbe7cd354afda9af695b0..f8b200eaaf2f1b2ee17214faf2df70b14a2ec93c 100644
|
|
|
905b4d |
--- a/src/config/etc/sssd.api.d/sssd-ad.conf
|
|
|
905b4d |
+++ b/src/config/etc/sssd.api.d/sssd-ad.conf
|
|
|
905b4d |
@@ -72,6 +72,7 @@ ldap_user_gid_number = str, None, false
|
|
|
905b4d |
ldap_user_gecos = str, None, false
|
|
|
905b4d |
ldap_user_home_directory = str, None, false
|
|
|
905b4d |
ldap_user_shell = str, None, false
|
|
|
905b4d |
+ldap_user_uuid = str, None, false
|
|
|
905b4d |
ldap_user_objectsid = str, None, false
|
|
|
905b4d |
ldap_user_primary_group = str, None, false
|
|
|
905b4d |
ldap_user_principal = 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 8713385fc2b6d3b03b75cd5c6557968fdcdad892..91dc9ec9d158758be32f8a3eb5d36be2446fc254 100644
|
|
|
905b4d |
--- a/src/config/etc/sssd.api.d/sssd-ipa.conf
|
|
|
905b4d |
+++ b/src/config/etc/sssd.api.d/sssd-ipa.conf
|
|
|
905b4d |
@@ -69,6 +69,7 @@ ldap_user_gid_number = str, None, false
|
|
|
905b4d |
ldap_user_gecos = str, None, false
|
|
|
905b4d |
ldap_user_home_directory = str, None, false
|
|
|
905b4d |
ldap_user_shell = str, None, false
|
|
|
905b4d |
+ldap_user_uuid = str, None, false
|
|
|
905b4d |
ldap_user_objectsid = str, None, false
|
|
|
905b4d |
ldap_user_primary_group = str, None, false
|
|
|
905b4d |
ldap_user_principal = 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 29276bfd74b9fcc67042a138006959896c34fbae..68d5b4953a07398b159f3374ccba7380a642d818 100644
|
|
|
905b4d |
--- a/src/config/etc/sssd.api.d/sssd-ldap.conf
|
|
|
905b4d |
+++ b/src/config/etc/sssd.api.d/sssd-ldap.conf
|
|
|
905b4d |
@@ -56,6 +56,7 @@ ldap_user_gid_number = str, None, false
|
|
|
905b4d |
ldap_user_gecos = str, None, false
|
|
|
905b4d |
ldap_user_home_directory = str, None, false
|
|
|
905b4d |
ldap_user_shell = str, None, false
|
|
|
905b4d |
+ldap_user_uuid = str, None, false
|
|
|
905b4d |
ldap_user_objectsid = str, None, false
|
|
|
905b4d |
ldap_user_primary_group = str, None, false
|
|
|
905b4d |
ldap_user_principal = str, None, false
|
|
|
905b4d |
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
|
|
|
905b4d |
index 9a9410b415a7419ee303aea6ec2f9f3d41509647..24bc34d3b9ca7a93b241a14ef712d4187306a347 100644
|
|
|
905b4d |
--- a/src/man/sssd-ldap.5.xml
|
|
|
905b4d |
+++ b/src/man/sssd-ldap.5.xml
|
|
|
905b4d |
@@ -338,6 +338,19 @@
|
|
|
905b4d |
</varlistentry>
|
|
|
905b4d |
|
|
|
905b4d |
<varlistentry>
|
|
|
905b4d |
+ <term>ldap_user_uuid (string)</term>
|
|
|
905b4d |
+ <listitem>
|
|
|
905b4d |
+ <para>
|
|
|
905b4d |
+ The LDAP attribute that contains the UUID/GUID of
|
|
|
905b4d |
+ an LDAP user object.
|
|
|
905b4d |
+ </para>
|
|
|
905b4d |
+ <para>
|
|
|
905b4d |
+ Default: nsUniqueId
|
|
|
905b4d |
+ </para>
|
|
|
905b4d |
+ </listitem>
|
|
|
905b4d |
+ </varlistentry>
|
|
|
905b4d |
+
|
|
|
905b4d |
+ <varlistentry>
|
|
|
905b4d |
<term>ldap_user_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 452516cd24aba4dfbf74376767deb8f5f487253d..ee70b3c4b71b87ab31ac07310a448d7960f8e9a8 100644
|
|
|
905b4d |
--- a/src/providers/ad/ad_opts.h
|
|
|
905b4d |
+++ b/src/providers/ad/ad_opts.h
|
|
|
905b4d |
@@ -187,6 +187,7 @@ struct sdap_attr_map ad_2008r2_user_map[] = {
|
|
|
905b4d |
{ "ldap_user_principal", "userPrincipalName", SYSDB_UPN, NULL },
|
|
|
905b4d |
{ "ldap_user_fullname", "name", SYSDB_FULLNAME, NULL },
|
|
|
905b4d |
{ "ldap_user_member_of", "memberOf", SYSDB_MEMBEROF, NULL },
|
|
|
905b4d |
+ { "ldap_user_uuid", "objectGUID", SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_user_objectsid", "objectSID", SYSDB_SID, NULL },
|
|
|
905b4d |
{ "ldap_user_primary_group", "primaryGroupID", SYSDB_PRIMARY_GROUP, NULL },
|
|
|
905b4d |
{ "ldap_user_modify_timestamp", "whenChanged", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
diff --git a/src/providers/ipa/ipa_opts.h b/src/providers/ipa/ipa_opts.h
|
|
|
905b4d |
index 473eca4f77727e008663d082e954820a9fb0c427..3fe858ca384015b3ffabe7ce391fa51089354719 100644
|
|
|
905b4d |
--- a/src/providers/ipa/ipa_opts.h
|
|
|
905b4d |
+++ b/src/providers/ipa/ipa_opts.h
|
|
|
905b4d |
@@ -178,6 +178,7 @@ struct sdap_attr_map ipa_user_map[] = {
|
|
|
905b4d |
{ "ldap_user_principal", "krbPrincipalName", SYSDB_UPN, NULL },
|
|
|
905b4d |
{ "ldap_user_fullname", "cn", SYSDB_FULLNAME, NULL },
|
|
|
905b4d |
{ "ldap_user_member_of", "memberOf", SYSDB_MEMBEROF, NULL },
|
|
|
905b4d |
+ { "ldap_user_uuid", "nsUniqueId", SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_user_objectsid", "ipaNTSecurityIdentifier", SYSDB_SID_STR, NULL },
|
|
|
905b4d |
{ "ldap_user_primary_group", NULL, SYSDB_PRIMARY_GROUP, NULL },
|
|
|
905b4d |
{ "ldap_user_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h
|
|
|
905b4d |
index 61e3309fe73e72e82ecb471d9b608db7bea1d2e6..2e937412635e16b4bc541c59055b1c4e7896f045 100644
|
|
|
905b4d |
--- a/src/providers/ldap/ldap_opts.h
|
|
|
905b4d |
+++ b/src/providers/ldap/ldap_opts.h
|
|
|
905b4d |
@@ -155,6 +155,7 @@ struct sdap_attr_map rfc2307_user_map[] = {
|
|
|
905b4d |
{ "ldap_user_principal", "krbPrincipalName", SYSDB_UPN, NULL },
|
|
|
905b4d |
{ "ldap_user_fullname", "cn", SYSDB_FULLNAME, NULL },
|
|
|
905b4d |
{ "ldap_user_member_of", NULL, SYSDB_MEMBEROF, NULL },
|
|
|
905b4d |
+ { "ldap_user_uuid", NULL, SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_user_objectsid", "objectSID", SYSDB_SID, NULL },
|
|
|
905b4d |
{ "ldap_user_primary_group", NULL, SYSDB_PRIMARY_GROUP, NULL },
|
|
|
905b4d |
{ "ldap_user_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
@@ -207,6 +208,8 @@ struct sdap_attr_map rfc2307bis_user_map[] = {
|
|
|
905b4d |
{ "ldap_user_principal", "krbPrincipalName", SYSDB_UPN, NULL },
|
|
|
905b4d |
{ "ldap_user_fullname", "cn", SYSDB_FULLNAME, NULL },
|
|
|
905b4d |
{ "ldap_user_member_of", "memberOf", SYSDB_MEMBEROF, NULL },
|
|
|
905b4d |
+ /* FIXME: this is 389ds specific */
|
|
|
905b4d |
+ { "ldap_user_uuid", "nsUniqueId", SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_user_objectsid", "objectSID", SYSDB_SID, NULL },
|
|
|
905b4d |
{ "ldap_user_primary_group", NULL, SYSDB_PRIMARY_GROUP, NULL },
|
|
|
905b4d |
{ "ldap_user_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
@@ -259,6 +262,7 @@ struct sdap_attr_map gen_ad2008r2_user_map[] = {
|
|
|
905b4d |
{ "ldap_user_principal", "userPrincipalName", SYSDB_UPN, NULL },
|
|
|
905b4d |
{ "ldap_user_fullname", "name", SYSDB_FULLNAME, NULL },
|
|
|
905b4d |
{ "ldap_user_member_of", "memberOf", SYSDB_MEMBEROF, NULL },
|
|
|
905b4d |
+ { "ldap_user_uuid", "objectGUID", SYSDB_UUID, NULL },
|
|
|
905b4d |
{ "ldap_user_objectsid", "objectSID", SYSDB_SID, NULL },
|
|
|
905b4d |
{ "ldap_user_primary_group", "primaryGroupID", SYSDB_PRIMARY_GROUP, NULL },
|
|
|
905b4d |
{ "ldap_user_modify_timestamp", "whenChanged", SYSDB_ORIG_MODSTAMP, NULL },
|
|
|
905b4d |
diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
|
|
|
905b4d |
index e9e23561c4c74d3b33ebe35aab86fc257bde6237..906fd74090509802909b300d26234f96d324a769 100644
|
|
|
905b4d |
--- a/src/providers/ldap/sdap.h
|
|
|
905b4d |
+++ b/src/providers/ldap/sdap.h
|
|
|
905b4d |
@@ -256,6 +256,7 @@ enum sdap_user_attrs {
|
|
|
905b4d |
SDAP_AT_USER_PRINC,
|
|
|
905b4d |
SDAP_AT_USER_FULLNAME,
|
|
|
905b4d |
SDAP_AT_USER_MEMBEROF,
|
|
|
905b4d |
+ SDAP_AT_USER_UUID,
|
|
|
905b4d |
SDAP_AT_USER_OBJECTSID,
|
|
|
905b4d |
SDAP_AT_USER_PRIMARY_GROUP,
|
|
|
905b4d |
SDAP_AT_USER_MODSTAMP,
|
|
|
905b4d |
--
|
|
|
905b4d |
1.9.3
|
|
|
905b4d |
|