>From 63c155b2ed966751b1895d74b12a2dcda1cd9f6f Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 7 Nov 2014 13:27:53 +0100 Subject: [PATCH] Revert "LDAP: Change defaults for ldap_user/group_objectsid" This reverts commit f834f712548db811695ea0fd6d6b31d3bd03e2a3. OpenLDAP server cannot dereference unknown attributes. The attribute objectSID isn't in any standard objectclass on OpenLDAP server. This is a reason why objectSID cannot be set by default in rfc2307 map and rfc2307bis map. It is the same problem as using non standard attribute "nsUniqueId" in ticket https://fedorahosted.org/sssd/ticket/2383 --- src/man/sssd-ldap.5.xml | 4 ++-- src/providers/ldap/ldap_opts.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index dad6f27933ced506fed7cd040e9fe91968295632..2dcf7e3f8ab5c307e0262efdebfc148c30ea3679 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -360,7 +360,7 @@ necessary for ActiveDirectory servers. - Default: ipaNTSecurityIdentifier for IPA, objectSID + Default: objectSid for ActiveDirectory, not set for other servers. @@ -882,7 +882,7 @@ necessary for ActiveDirectory servers. - Default: ipaNTSecurityIdentifier for IPA, objectSID + Default: objectSid for ActiveDirectory, not set for other servers. diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h index 29d9faf99784bfc3526398488be837a2716ee11d..dedbdac0bcf647337d4c00b1fbb82d6b46be5b54 100644 --- a/src/providers/ldap/ldap_opts.h +++ b/src/providers/ldap/ldap_opts.h @@ -156,7 +156,7 @@ struct sdap_attr_map rfc2307_user_map[] = { { "ldap_user_fullname", "cn", SYSDB_FULLNAME, NULL }, { "ldap_user_member_of", NULL, SYSDB_MEMBEROF, NULL }, { "ldap_user_uuid", NULL, SYSDB_UUID, NULL }, - { "ldap_user_objectsid", "objectSID", SYSDB_SID, NULL }, + { "ldap_user_objectsid", NULL, SYSDB_SID, NULL }, { "ldap_user_primary_group", NULL, SYSDB_PRIMARY_GROUP, NULL }, { "ldap_user_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_user_entry_usn", NULL, SYSDB_USN, NULL }, @@ -190,7 +190,7 @@ struct sdap_attr_map rfc2307_group_map[] = { { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "memberuid", SYSDB_MEMBER, NULL }, { "ldap_group_uuid", NULL, SYSDB_UUID, NULL }, - { "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL }, + { "ldap_group_objectsid", NULL, SYSDB_SID, NULL }, { "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_group_entry_usn", NULL, SYSDB_USN, NULL }, { "ldap_group_type", NULL, SYSDB_GROUP_TYPE, NULL }, @@ -210,7 +210,7 @@ struct sdap_attr_map rfc2307bis_user_map[] = { { "ldap_user_fullname", "cn", SYSDB_FULLNAME, NULL }, { "ldap_user_member_of", "memberOf", SYSDB_MEMBEROF, NULL }, { "ldap_user_uuid", NULL, SYSDB_UUID, NULL }, - { "ldap_user_objectsid", "objectSID", SYSDB_SID, NULL }, + { "ldap_user_objectsid", NULL, SYSDB_SID, NULL }, { "ldap_user_primary_group", NULL, SYSDB_PRIMARY_GROUP, NULL }, { "ldap_user_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_user_entry_usn", NULL, SYSDB_USN, NULL }, @@ -244,7 +244,7 @@ struct sdap_attr_map rfc2307bis_group_map[] = { { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "member", SYSDB_MEMBER, NULL }, { "ldap_group_uuid", NULL, SYSDB_UUID, NULL }, - { "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL }, + { "ldap_group_objectsid", NULL, SYSDB_SID, NULL }, { "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_group_entry_usn", NULL, SYSDB_USN, NULL }, { "ldap_group_type", NULL, SYSDB_GROUP_TYPE, NULL }, -- 2.1.0