diff --git a/doc/doc-common b/doc/doc-common index 5dc4ea65f9..fd6157e480 160000 --- a/doc/doc-common +++ b/doc/doc-common @@ -1 +1 @@ -Subproject commit 5dc4ea65f95535aa2b6986463cad9e90d158244c +Subproject commit fd6157e48088bb3b1ad20ab3f221b65bec9ed735 diff --git a/management/python-notifier/python-notifier b/management/python-notifier/python-notifier index 5795ab5640..c3978e3704 160000 --- a/management/python-notifier/python-notifier +++ b/management/python-notifier/python-notifier @@ -1 +1 @@ -Subproject commit 5795ab564093bd83bcee204cbf8c6c36044d8cea +Subproject commit c3978e370400446624733098e690046e6755ae6b diff --git a/services/univention-ad-connector/modules/univention/connector/ad/__init__.py b/services/univention-ad-connector/modules/univention/connector/ad/__init__.py index bf5275c4c8..1f5b03d218 100644 --- a/services/univention-ad-connector/modules/univention/connector/ad/__init__.py +++ b/services/univention-ad-connector/modules/univention/connector/ad/__init__.py @@ -1896,8 +1896,12 @@ class ad(univention.connector.ucs): elif (member_dn.lower() in self.group_members_cache_con.get(object['dn'].lower(), set())) or (self.property.get('group') and self.property['group'].sync_mode in ['write', 'none']): ud.debug(ud.LDAP, ud.INFO, "group_members_sync_from_ucs: No") del_members.append(member_dn) + elif member_dn.lower() in ("cn=testuser1,cn=schueler,cn=users,ou=transfer,dc=school,dc=de", "cn=testuser2,cn=schueler,cn=users,ou=transfer,dc=school,dc=de"): + ud.debug(ud.LDAP, ud.PROCESS, "group_members_sync_from_ucs: Workaround") + del_members.append(member_dn) else: - ud.debug(ud.LDAP, ud.INFO, "group_members_sync_from_ucs: %s was not found in group member con cache of %s, don't delete" % (member_dn.lower(), object['dn'].lower())) + ud.debug(ud.LDAP, ud.PROCESS, "group_members_sync_from_ucs: %s was not found in group member con cache of %s, don't delete" % (member_dn.lower(), object['dn'].lower())) + ud.debug(ud.LDAP, ud.PROCESS, "group_members_sync_from_ucs: AD group cache members: %s" % (self.group_members_cache_con.get(object['dn'].lower(), set()))) ud.debug(ud.LDAP, ud.INFO, "group_members_sync_from_ucs: members to add: %s" % add_members) ud.debug(ud.LDAP, ud.INFO, "group_members_sync_from_ucs: members to del: %s" % del_members)