Attachment 10602 Details for Bug 52251

[patch] bug52251-mapping-table.patch

bug52251-mapping-table.patch (text/plain), 1.20 KB, created by Arvid Requate on 2021-01-24 19:44 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2021-01-24 19:44 CET

Size: 1.20 KB

patch

obsolete

>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 72902e8234..6cdb2860b0 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
>@@ -46,8 +46,6 @@ import univention.s4connector.s4.user
> 
> from univention.s4connector.s4.mapping import ignore_filter_from_tmpl, ignore_filter_from_attr, configRegistry
> 
>-from six import text_type as _text_type
>-
> global_ignore_subtree = [
> 	'cn=univention,@%@ldap/base@%@',
> 	'cn=policies,@%@ldap/base@%@',
>@@ -105,7 +103,7 @@ if configRegistry.is_false('connector/s4/mapping/group/grouptype', False):
> 
> key_prefix = "connector/s4/mapping/group/table/"
> group_mapping_table = {
>-	'cn': [(_text_type(key[len(key_prefix):]), _text_type(value)) for key, value in configRegistry.items() if key.startswith(key_prefix)]
>+	'cn': [(key[len(key_prefix):].encode('UTF-8'), value.encode('UTF-8')) for key, value in configRegistry.items() if key.startswith(key_prefix)]
> }
> if not group_mapping_table['cn']:
> 	group_mapping_table = {}

Actions: View | Diff

Attachments on bug 52251: 10602