Attachment #7478 for bug #40651

View | Details | Raw Unified | Return to bug 40651
Collapse All | Expand All




		if not self.hasChanged('primaryGroup'):
			return

		searchResult=self.lo.search(base=self['primaryGroup'], scope='base', attr=['gidNumber'])
		for tmp,number in searchResult:
			primaryGroupNumber = number['gidNumber']
		self.newPrimaryGroupDn=self['primaryGroup']

		if 'samba' in self.options:
			searchResult=self.lo.search(base=self['primaryGroup'], scope='base', attr=['sambaSID'])
			for tmp,number in searchResult:
				primaryGroupSambaNumber = number['sambaSID']


					'person',
					'ldap_pwd')

			if 'samba' in self.options and not self.lo.search(base=self['primaryGroup'], scope='base', attr=['sambaSID'])[0][1]:
				raise univention.admin.uexceptions.primaryGroupWithoutSamba

			if 'posix' in self.options or 'samba' in self.options:
				if self['primaryGroup']:
					searchResult=self.lo.search(base=self['primaryGroup'], scope='base', attr=['gidNumber'])
					for tmp,number in searchResult:
						gidNum = number['gidNumber'][0]
					self.newPrimaryGroupDn=self['primaryGroup']

Lines 457-463 Link Here

(-)modules/univention/admin/handlers/groups/group.py (-1 / +1 lines)
457	ml = []	457	ml = []
458	uids = []	458	uids = []
459	members = []	459	members = []
460	searchResult = self.lo.search(base=self.dn, attr=['uniqueMember','memberUid'])	460	searchResult = self.lo.search(base=self.dn, scope='base', attr=['uniqueMember','memberUid'])
461	if searchResult:	461	if searchResult:
462	uids = searchResult[0][1].get('memberUid',[])	462	uids = searchResult[0][1].get('memberUid',[])
463	members = searchResult[0][1].get('uniqueMember',[])	463	members = searchResult[0][1].get('uniqueMember',[])

Return to bug 40651

Lines 1698-1710 Link Here

(-)modules/univention/admin/handlers/users/user.py (-4 / +4 lines)
1698	if not self.hasChanged('primaryGroup'):	1698	if not self.hasChanged('primaryGroup'):
1699	return	1699	return
1700		1700
1701	searchResult=self.lo.search(base=self['primaryGroup'], attr=['gidNumber'])	1701	searchResult=self.lo.search(base=self['primaryGroup'], scope='base', attr=['gidNumber'])
1702	for tmp,number in searchResult:	1702	for tmp,number in searchResult:
1703	primaryGroupNumber = number['gidNumber']	1703	primaryGroupNumber = number['gidNumber']
1704	self.newPrimaryGroupDn=self['primaryGroup']	1704	self.newPrimaryGroupDn=self['primaryGroup']
1705		1705
1706	if 'samba' in self.options:	1706	if 'samba' in self.options:
1707	searchResult=self.lo.search(base=self['primaryGroup'], attr=['sambaSID'])	1707	searchResult=self.lo.search(base=self['primaryGroup'], scope='base', attr=['sambaSID'])
1708	for tmp,number in searchResult:	1708	for tmp,number in searchResult:
1709	primaryGroupSambaNumber = number['sambaSID']	1709	primaryGroupSambaNumber = number['sambaSID']
1710		1710
Lines 1771-1782 Link Here
1771	'person',	1771	'person',
1772	'ldap_pwd')	1772	'ldap_pwd')
1773		1773
1774	if 'samba' in self.options and not self.lo.search(base=self['primaryGroup'], attr=['sambaSID'])[0][1]:	1774	if 'samba' in self.options and not self.lo.search(base=self['primaryGroup'], scope='base', attr=['sambaSID'])[0][1]:
1775	raise univention.admin.uexceptions.primaryGroupWithoutSamba	1775	raise univention.admin.uexceptions.primaryGroupWithoutSamba
1776		1776
1777	if 'posix' in self.options or 'samba' in self.options:	1777	if 'posix' in self.options or 'samba' in self.options:
1778	if self['primaryGroup']:	1778	if self['primaryGroup']:
1779	searchResult=self.lo.search(base=self['primaryGroup'], attr=['gidNumber'])	1779	searchResult=self.lo.search(base=self['primaryGroup'], scope='base', attr=['gidNumber'])
1780	for tmp,number in searchResult:	1780	for tmp,number in searchResult:
1781	gidNum = number['gidNumber'][0]	1781	gidNum = number['gidNumber'][0]
1782	self.newPrimaryGroupDn=self['primaryGroup']	1782	self.newPrimaryGroupDn=self['primaryGroup']