Attachment 7478 Details for Bug 40651 – udm.patch

[patch] udm.patch

udm.patch (text/plain), 2.25 KB, created by Felix Botner on 2016-02-12 16:40:39 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Botner

Created: 2016-02-12 16:40:39 CET

Size: 2.25 KB

patch

obsolete

>Index: modules/univention/admin/handlers/users/user.py
>===================================================================
>--- modules/univention/admin/handlers/users/user.py	(Revision 65838)
>+++ modules/univention/admin/handlers/users/user.py	(Arbeitskopie)
>@@ -1698,13 +1698,13 @@
> 		if not self.hasChanged('primaryGroup'):
> 			return
> 
>-		searchResult=self.lo.search(base=self['primaryGroup'], attr=['gidNumber'])
>+		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'], attr=['sambaSID'])
>+			searchResult=self.lo.search(base=self['primaryGroup'], scope='base', attr=['sambaSID'])
> 			for tmp,number in searchResult:
> 				primaryGroupSambaNumber = number['sambaSID']
> 
>@@ -1771,12 +1771,12 @@
> 					'person',
> 					'ldap_pwd')
> 
>-			if 'samba' in self.options and not self.lo.search(base=self['primaryGroup'], attr=['sambaSID'])[0][1]:
>+			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'], attr=['gidNumber'])
>+					searchResult=self.lo.search(base=self['primaryGroup'], scope='base', attr=['gidNumber'])
> 					for tmp,number in searchResult:
> 						gidNum = number['gidNumber'][0]
> 					self.newPrimaryGroupDn=self['primaryGroup']
>Index: modules/univention/admin/handlers/groups/group.py
>===================================================================
>--- modules/univention/admin/handlers/groups/group.py	(Revision 65838)
>+++ modules/univention/admin/handlers/groups/group.py	(Arbeitskopie)
>@@ -457,7 +457,7 @@
> 		ml = []
> 		uids = []
> 		members = []
>-		searchResult = self.lo.search(base=self.dn, attr=['uniqueMember','memberUid'])
>+		searchResult = self.lo.search(base=self.dn, scope='base', attr=['uniqueMember','memberUid'])
> 		if searchResult:
> 			uids = searchResult[0][1].get('memberUid',[])
> 			members = searchResult[0][1].get('uniqueMember',[])

Actions: View | Diff

Attachments on bug 40651: 7478