From dfb2960ab251f609466fa660449703835c97f99a Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 22 Jul 2014 09:51:18 +0200 Subject: LDAP: Remove unused option ldap_user_uuid There is problem with OpenLDAP server and dereferencing of attributes that is not in the schema of the server? sh-4.2$ ldapsearch -x -LLL -h openldap.server.test -b 'dc=example,dc=com' \ -E 'deref=member:uid,dummy_attr' cn=ref_grp Protocol error (2) Additional information: Dereference control: attribute decoding error sh-4.2$ echo $? 2 The attribute nsUniqueID is a 389-only, non-standard attribute. It is an operational attribute that is not in the rfc2307bis nor inetOrgPerson nor posixAccount schema. It was a default value of option ldap_user_uuid, but it was not use anywhere. Resolves: https://fedorahosted.org/sssd/ticket/2383 Reviewed-by: Jakub Hrozek --- src/config/SSSDConfig/__init__.py.in | 1 - src/config/SSSDConfig/sssd_upgrade_config.py | 1 - src/config/etc/sssd.api.d/sssd-ad.conf | 1 - src/config/etc/sssd.api.d/sssd-ipa.conf | 1 - src/config/etc/sssd.api.d/sssd-ldap.conf | 1 - 5 files changed, 5 deletions(-) (limited to 'src/config') diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 1bf2e6ff3..05672d651 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -253,7 +253,6 @@ option_strings = { 'ldap_user_gecos' : _('GECOS attribute'), 'ldap_user_home_directory' : _('Home directory attribute'), 'ldap_user_shell' : _('Shell attribute'), - 'ldap_user_uuid' : _('UUID attribute'), 'ldap_user_objectsid' : _("objectSID attribute"), 'ldap_user_primary_group' : _('Active Directory primary group attribute for ID-mapping'), 'ldap_user_principal' : _('User principal attribute (for Kerberos)'), diff --git a/src/config/SSSDConfig/sssd_upgrade_config.py b/src/config/SSSDConfig/sssd_upgrade_config.py index 97be6543f..3d9f788c3 100644 --- a/src/config/SSSDConfig/sssd_upgrade_config.py +++ b/src/config/SSSDConfig/sssd_upgrade_config.py @@ -170,7 +170,6 @@ class SSSDConfigFile(SSSDChangeConf): 'ldap_user_gecos' : 'userGecos', 'ldap_user_home_directory' : 'userHomeDirectory', 'ldap_user_shell' : 'userShell', - 'ldap_user_uuid' : 'userUUID', 'ldap_user_principal' : 'userPrincipal', 'ldap_force_upper_case_realm' : 'force_upper_case_realm', 'ldap_user_fullname' : 'userFullname', diff --git a/src/config/etc/sssd.api.d/sssd-ad.conf b/src/config/etc/sssd.api.d/sssd-ad.conf index 9a9ed0f28..7055c41be 100644 --- a/src/config/etc/sssd.api.d/sssd-ad.conf +++ b/src/config/etc/sssd.api.d/sssd-ad.conf @@ -63,7 +63,6 @@ ldap_user_gid_number = str, None, false ldap_user_gecos = str, None, false ldap_user_home_directory = str, None, false ldap_user_shell = str, None, false -ldap_user_uuid = str, None, false ldap_user_objectsid = str, None, false ldap_user_primary_group = str, None, false ldap_user_principal = str, None, false diff --git a/src/config/etc/sssd.api.d/sssd-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf index db3c623a5..f3b9cb063 100644 --- a/src/config/etc/sssd.api.d/sssd-ipa.conf +++ b/src/config/etc/sssd.api.d/sssd-ipa.conf @@ -69,7 +69,6 @@ ldap_user_gid_number = str, None, false ldap_user_gecos = str, None, false ldap_user_home_directory = str, None, false ldap_user_shell = str, None, false -ldap_user_uuid = str, None, false ldap_user_objectsid = str, None, false ldap_user_primary_group = str, None, false ldap_user_principal = 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 e14acf5b7..a4802a1ea 100644 --- a/src/config/etc/sssd.api.d/sssd-ldap.conf +++ b/src/config/etc/sssd.api.d/sssd-ldap.conf @@ -56,7 +56,6 @@ ldap_user_gid_number = str, None, false ldap_user_gecos = str, None, false ldap_user_home_directory = str, None, false ldap_user_shell = str, None, false -ldap_user_uuid = str, None, false ldap_user_objectsid = str, None, false ldap_user_primary_group = str, None, false ldap_user_principal = str, None, false -- cgit