commit 28fc1da126f8551d545e67f662ff98d4482a1534
Author: Florian Best <best@univention.de>
Date:   Sun Sep 22 10:53:41 2019 +0200

    Bug #50239: fix mapping of allowedEmailUsers, allowedEmailGroups for python3 compatibility

diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py
index 48df11b39d..631264a872 100644
--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py
+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py
@@ -246,6 +246,8 @@ mapping.register('sambaGroupType', 'sambaGroupType', None, univention.admin.mapp
 mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)
 mapping.register('adGroupType', 'univentionGroupType', None, univention.admin.mapping.ListToString)
 mapping.register('sambaPrivileges', 'univentionSambaPrivilegeList')
+mapping.register('allowedEmailUsers', 'univentionAllowedEmailUsers')
+mapping.register('allowedEmailGroups', 'univentionAllowedEmailGroups')
 
 
 def _case_insensitive_in_list(dn, list):
@@ -374,9 +376,6 @@ class object(univention.admin.handlers.simpleLdap):
 			time_end = time.time()
 			ud.debug(ud.ADMIN, ud.INFO, 'groups/group: open(): member check duration: %1.2fs' % (time_end - time_start))
 
-			self['allowedEmailUsers'] = self.oldattr.get('univentionAllowedEmailUsers', [])
-			self['allowedEmailGroups'] = self.oldattr.get('univentionAllowedEmailGroups', [])
-
 			self.save()
 
 	def fast_member_add(self, memberdnlist, uidlist):
@@ -617,16 +616,6 @@ class object(univention.admin.handlers.simpleLdap):
 			if memberUidAdd:
 				ml.append(('memberUid', '', memberUidAdd))
 
-		oldEmailUsers = self.oldinfo.get('allowedEmailUsers', [])
-		newEmailUsers = self.info.get('allowedEmailUsers', [])
-		if set(oldEmailUsers) != set(newEmailUsers):  # compare sets since the order of values does not matter
-			ml.append(('univentionAllowedEmailUsers', oldEmailUsers, newEmailUsers))
-
-		oldEmailGroups = self.oldinfo.get('allowedEmailGroups', [])
-		newEmailGroups = self.info.get('allowedEmailGroups', [])
-		if set(oldEmailGroups) != set(newEmailGroups):  # compare sets since the order of values does not matter
-			ml.append(('univentionAllowedEmailGroups', oldEmailGroups, newEmailGroups))
-
 		return ml
 
 	def _ldap_post_create(self):
diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/mail/lists.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/mail/lists.py
index b99c694960..25b0ded5df 100644
--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/mail/lists.py
+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/mail/lists.py
@@ -120,19 +120,13 @@ mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)
 mapping.register('description', 'description', None, univention.admin.mapping.ListToString)
 mapping.register('members', 'univentionMailMember')
 mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)
+mapping.register('allowedEmailUsers', 'univentionAllowedEmailUsers')
+mapping.register('allowedEmailGroups', 'univentionAllowedEmailGroups')
 
 
 class object(univention.admin.handlers.simpleLdap):
 	module = module
 
-	def open(self):
-		univention.admin.handlers.simpleLdap.open(self)
-
-		self['allowedEmailUsers'] = self.oldattr.get('univentionAllowedEmailUsers', [])
-		self['allowedEmailGroups'] = self.oldattr.get('univentionAllowedEmailGroups', [])
-
-		self.save()
-
 	def _ldap_post_create(self):
 		if self['mailAddress']:
 			univention.admin.allocators.confirm(self.lo, self.position, 'mailPrimaryAddress', self['mailAddress'])
@@ -167,17 +161,6 @@ class object(univention.admin.handlers.simpleLdap):
 					raise univention.admin.uexceptions.mailAddressUsed
 
 		ml = univention.admin.handlers.simpleLdap._ldap_modlist(self)
-
-		oldEmailUsers = self.oldinfo.get('allowedEmailUsers', [])
-		newEmailUsers = self.info.get('allowedEmailUsers', [])
-		if oldEmailUsers != newEmailUsers:
-			ml.append(('univentionAllowedEmailUsers', oldEmailUsers, newEmailUsers))
-
-		oldEmailGroups = self.oldinfo.get('allowedEmailGroups', [])
-		newEmailGroups = self.info.get('allowedEmailGroups', [])
-		if oldEmailGroups != newEmailGroups:
-			ml.append(('univentionAllowedEmailGroups', oldEmailGroups, newEmailGroups))
-
 		return ml