Attachment 9489 Details for Bug 46751 – remove obsolte call and handle empty proxyAddress

[patch] remove obsolte call and handle empty proxyAddress

bug46751.patch (text/plain), 1.68 KB, created by Nico Stöckigt on 2018-03-28 16:46:35 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Nico Stöckigt

Created: 2018-03-28 16:46:35 CEST

Size: 1.68 KB

patch

obsolete

>diff --git a/services/univention-ad-connector/modules/univention/connector/ad/password.py b/services/univention-ad-connector/modules/univention/connector/ad/password.py
>index 911175f2d3..f7aa5459ae 100644
>--- a/services/univention-ad-connector/modules/univention/connector/ad/password.py
>+++ b/services/univention-ad-connector/modules/univention/connector/ad/password.py
>@@ -308,8 +308,6 @@ def password_sync_ucs(connector, key, object):
> def password_sync_kinit(connector, key, ucs_object):
> 	_d = ud.function('ldap.ad.password_sync_kinit')
> 
>-	object = connector._object_mapping(key, ucs_object, 'ucs')
>-
> 	attr = {'userPassword': '{KINIT}', 'sambaNTPassword': 'NO PASSWORD*********************', 'sambaLMPassword': 'NO PASSWORD*********************'}
> 
> 	ucs_result = connector.lo.search(base=ucs_object['dn'], attr=attr.keys())
>diff --git a/services/univention-ad-connector/modules/univention/connector/ad/proxyAddresses.py b/services/univention-ad-connector/modules/univention/connector/ad/proxyAddresses.py
>index 642db52f0a..1fb6b96bb5 100644
>--- a/services/univention-ad-connector/modules/univention/connector/ad/proxyAddresses.py
>+++ b/services/univention-ad-connector/modules/univention/connector/ad/proxyAddresses.py
>@@ -67,7 +67,8 @@ def equal(values1, values2):
> def to_proxyAddresses(s4connector, key, object):
> 	_d = ud.function('proxyAddesses.ucs_to_ad_mapping')
> 	new_con_values = []
>-	mailPrimaryAddress = object['attributes'].get('mailPrimaryAddress', [None])[0]
>+	ucs_values = object['attributes'].get('mailPrimaryAddress', [])
>+	mailPrimaryAddress = ucs_values[0] if ucs_values else None
> 	if mailPrimaryAddress:
> 		new_con_value = 'SMTP:' + mailPrimaryAddress
> 		new_con_values.append(new_con_value)

Actions: View | Diff

Attachments on bug 46751: 9489