diff --git a/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py b/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py index 91bb111f1a..880011f1ad 100644 --- a/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py +++ b/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py @@ -121,27 +121,25 @@ if ignore_filter: ldap_attribute='uid', con_attribute='sAMAccountName', required=1, + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'givenName' : univention.s4connector.attribute ( ucs_attribute='firstname', ldap_attribute='givenName', con_attribute='givenName', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'displayName': univention.s4connector.attribute ( ucs_attribute='displayName', ldap_attribute='displayName', con_attribute='displayName', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'sn': univention.s4connector.attribute ( ucs_attribute='lastname', ldap_attribute='sn', con_attribute='sn', - compare_function=univention.s4connector.compare_normal, single_value=True, ), @!@ @@ -197,14 +195,12 @@ if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi ucs_attribute='organisation', ldap_attribute='o', con_attribute='company', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'description': univention.s4connector.attribute ( ucs_attribute='description', ldap_attribute='description', con_attribute='description', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'mailPrimaryAddress': univention.s4connector.attribute ( @@ -218,14 +214,12 @@ if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi ucs_attribute='street', ldap_attribute='street', con_attribute='streetAddress', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'city': univention.s4connector.attribute ( ucs_attribute='city', ldap_attribute='l', con_attribute='l', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'postcode': univention.s4connector.attribute ( @@ -360,13 +354,13 @@ if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi ldap_attribute='cn', con_attribute='sAMAccountName', required=1, + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'description': univention.s4connector.attribute ( ucs_attribute='description', ldap_attribute='description', con_attribute='description', - compare_function=univention.s4connector.compare_normal, single_value=True, ), @!@ @@ -472,18 +466,19 @@ if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi ldap_attribute='cn', con_attribute='cn', required=1, + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'samAccountName': univention.s4connector.attribute ( ldap_attribute='uid', con_attribute='sAMAccountName', + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'description': univention.s4connector.attribute ( ucs_attribute='description', ldap_attribute='description', con_attribute='description', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'operatingSystem': univention.s4connector.attribute ( @@ -566,18 +561,19 @@ if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not confi ldap_attribute='cn', con_attribute='cn', required=1, + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'samAccountName': univention.s4connector.attribute ( ldap_attribute='uid', con_attribute='sAMAccountName', + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'description': univention.s4connector.attribute ( ucs_attribute='description', ldap_attribute='description', con_attribute='description', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'operatingSystem': univention.s4connector.attribute ( @@ -678,13 +674,13 @@ if configRegistry.is_true('connector/s4/mapping/gpo', True): ldap_attribute='cn', con_attribute='cn', required=1, + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'description': univention.s4connector.attribute ( ucs_attribute='description', ldap_attribute='description', con_attribute='description', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'displayName': univention.s4connector.attribute ( @@ -809,14 +805,12 @@ if configRegistry.is_true('connector/s4/mapping/wmifilter', False): ucs_attribute='description', ldap_attribute='description', con_attribute='description', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'displayName': univention.s4connector.attribute ( ucs_attribute='displayName', ldap_attribute='displayName', con_attribute='displayName', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'author': univention.s4connector.attribute ( @@ -921,20 +915,19 @@ if configRegistry.is_true('connector/s4/mapping/msprintconnectionpolicy', False) ldap_attribute='cn', con_attribute='cn', required=1, + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'description': univention.s4connector.attribute ( ucs_attribute='description', ldap_attribute='description', con_attribute='description', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'displayName': univention.s4connector.attribute ( ucs_attribute='displayName', ldap_attribute='displayName', con_attribute='displayName', - compare_function=univention.s4connector.compare_normal, single_value=True, ), 'msPrintAttributes': univention.s4connector.attribute ( @@ -997,13 +990,13 @@ if ignore_filter: ldap_attribute='cn', con_attribute='cn', required=1, + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'description': univention.s4connector.attribute ( ucs_attribute='description', ldap_attribute='description', con_attribute='description', - compare_function=univention.s4connector.compare_normal, single_value=True, ), @!@ @@ -1052,13 +1045,13 @@ if ignore_filter: ldap_attribute='ou', con_attribute='ou', required=1, + compare_function=univention.s4connector.compare_lowercase, single_value=True, ), 'description': univention.s4connector.attribute ( ucs_attribute='description', ldap_attribute='description', con_attribute='description', - compare_function=univention.s4connector.compare_normal, single_value=True, ), @!@ diff --git a/services/univention-s4-connector/modules/univention/s4connector/__init__.py b/services/univention-s4-connector/modules/univention/s4connector/__init__.py index db7246c76b..966d61cb4e 100644 --- a/services/univention-s4-connector/modules/univention/s4connector/__init__.py +++ b/services/univention-s4-connector/modules/univention/s4connector/__init__.py @@ -349,8 +349,8 @@ class attribute: self.con_attribute = con_attribute self.con_other_attribute = con_other_attribute self.required = required - # If no compare_function is given, we default to `compare_lowercase()` - self.compare_function = compare_function or compare_lowercase + # If no compare_function is given, we default to `compare_normal()` + self.compare_function = compare_function or compare_normal if mapping: self.mapping = mapping # Make a reverse check of this mapping. This is necassary if the attribute is