Attachment 9061 Details for Bug 18479 – 18479-adc-change-groupname-421.patch

[patch] 18479-adc-change-groupname-421.patch

18479-adc-change-groupname-421.patch (text/plain), 2.34 KB, created by Lukas Oyen on 2017-07-26 16:26:43 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Oyen

Created: 2017-07-26 16:26:43 CEST

Size: 2.34 KB

patch

obsolete

>From a4e1c2dd23fba65091c7afe9a7426b95694cf6be Mon Sep 17 00:00:00 2001
>From: Lukas Oyen <oyen@univention.de>
>Date: Wed, 26 Jul 2017 16:18:32 +0200
>Subject: [PATCH 1/2] Bug #18479: adc: save changed DN on udm modify
>
>---
> .../modules/univention/connector/__init__.py                       | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/services/univention-ad-connector/modules/univention/connector/__init__.py b/services/univention-ad-connector/modules/univention/connector/__init__.py
>index e055bc8..82b2103 100644
>--- a/services/univention-ad-connector/modules/univention/connector/__init__.py
>+++ b/services/univention-ad-connector/modules/univention/connector/__init__.py
>@@ -1191,7 +1191,12 @@ class ucs:
> 		else:
> 			ucs_object = univention.admin.objects.get(module, None, self.lo, dn=object['dn'], position='')
> 		self.__set_values(property_type, object, ucs_object)
>-		return ucs_object.modify() and self.__modify_custom_attributes(property_type, object, ucs_object, module, position)
>+		modified_dn = ucs_object.modify()
>+		if modified_dn:
>+			object['dn'] = modified_dn
>+			return self.__modify_custom_attributes(property_type, object,
>+				ucs_object, module, position)
>+		return False
> 
> 	def move_in_ucs(self, property_type, object, module, position):
> 		_d = ud.function('ldap.move_in_ucs')
>-- 
>2.7.4
>
>
>From f4b07d7fdb3ecc7fd834f5572117e12c9710a294 Mon Sep 17 00:00:00 2001
>From: Lukas Oyen <oyen@univention.de>
>Date: Wed, 26 Jul 2017 14:52:54 +0200
>Subject: [PATCH 2/2] Bug #18479: adc-test: enable 172sync_ad_change_groupname
>
>---
> test/ucs-test/tests/55_adconnector/172sync_ad_change_groupname | 5 -----
> 1 file changed, 5 deletions(-)
>
>diff --git a/test/ucs-test/tests/55_adconnector/172sync_ad_change_groupname b/test/ucs-test/tests/55_adconnector/172sync_ad_change_groupname
>index 4a313e0..f89228a 100755
>--- a/test/ucs-test/tests/55_adconnector/172sync_ad_change_groupname
>+++ b/test/ucs-test/tests/55_adconnector/172sync_ad_change_groupname
>@@ -3,17 +3,12 @@
> ## exposure: dangerous
> ## packages:
> ## - univention-ad-connector
>-## versions:
>-##  3.0-0: skip
> ## bugs:
> ##  - 18479
> ## tags:
> ##  - groupsync
> ##  - skip_admember
> 
>-# skip test, see https://forge.univention.org/bugzilla/show_bug.cgi?id=28696
>-exit 131
>-
> . "$TESTLIBPATH/base.sh" || exit 137
> . "$TESTLIBPATH/udm.sh" || exit 137
> . "$TESTLIBPATH/random.sh" || exit 137 
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 18479: 9061 | 9062