Attachment 10196 Details for Bug 50305

[patch] patch (git:fbest/50305-remove-normalise-userAccountControl)

50305.patch (text/plain), 2.28 KB, created by Florian Best on 2019-10-02 16:49 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2019-10-02 16:49 CEST

Size: 2.28 KB

patch

obsolete

>commit 1f6616bfede6cadc81b998fd86860e1c4cd0d613
>Author: Florian Best <best@univention.de>
>Date:   Wed Oct 2 16:48:44 2019 +0200
>
>    Bug #50305: do not use normalise_userAccountControl() anymore.
>
>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 30d7499dc6..6379446534 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
>@@ -195,9 +195,7 @@ s4_mapping = {
> 			univention.s4connector.set_primary_group_user,
> 			univention.s4connector.s4.sid_mapping.sid_to_ucs if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not configRegistry.is_true('connector/s4/mapping/sid', True) else None,
> 		]),
>-		post_con_create_functions=[
>-			univention.s4connector.s4.normalise_userAccountControl,
>-		],
>+		con_create_attributes=[('userAccountControl', ['512'])],
> 		post_con_modify_functions=filter(None, [
> 			univention.s4connector.s4.sid_mapping.sid_to_s4 if configRegistry.is_true('connector/s4/mapping/sid_to_s4', False) and not configRegistry.is_true('connector/s4/mapping/sid', True) else None,
> 			univention.s4connector.s4.password.password_sync_ucs_to_s4,
>diff --git a/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py b/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py
>index 6c62994ced..fd91278296 100644
>--- a/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py
>+++ b/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py
>@@ -41,6 +41,7 @@ import sys
> import time
> import types
> import pprint
>+import warnings
> 
> import ldap
> from ldap.controls import LDAPControl
>@@ -67,6 +68,7 @@ PAGE_SIZE = 1000
> 
> 
> def normalise_userAccountControl(s4connector, key, object):
>+	warnings.warn('The function normalise_userAccountControl() is deprecated and should not be used in the mapping anymore. Use con_create_attributes instead.')
> 	# set userAccountControl to 512 -- accounts synced to samba4 alpha17 had userAccountControl == 544
> 	ud.debug(ud.LDAP, ud.ALL, "normalise_userAccountControl: dn: %s" % object['dn'])
> 	for i in range(0, 10):

Actions: View | Diff

Attachments on bug 50305: 10196