Attachment 8175 Details for Bug 42809

[patch] code cleanup

share_restrictions_cleanup.patch (text/plain), 1.54 KB, created by Daniel Tröder on 2016-11-01 09:20 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Tröder

Created: 2016-11-01 09:20 CET

Size: 1.54 KB

patch

obsolete

>Index: ucs-4.1-3/services/univention-samba/python/share_restrictions.py
>===================================================================
>--- ucs-4.1-3/services/univention-samba/python/share_restrictions.py	(Revision 73946)
>+++ ucs-4.1-3/services/univention-samba/python/share_restrictions.py	(Arbeitskopie)
>@@ -275,8 +275,9 @@
> 		if not group or not value.lower() in ('true', 'yes', '1'):
> 			return
> 
>+		marktplatz_share_name = ucr.get('ucsschool/import/generate/share/marktplatz/name', 'Marktplatz').lower()
> 		for share in self._shares.values():
>-			if share.name in (group, 'marktplatz', 'homes'):
>+			if share.name.lower() in (group.lower(), marktplatz_share_name, 'homes'):
> 				continue
> 
> 			share.invalid_users = '@' + group
>@@ -286,9 +287,9 @@
> 		if not value:
> 			return
> 
>-		hosts = value.split(' ')
>+		marktplatz_share_name = ucr.get('ucsschool/import/generate/share/marktplatz/name', 'Marktplatz').lower()
> 		for share in self._shares.values():
>-			if share.name in ('marktplatz', 'homes'):
>+			if share.name.lower() in (marktplatz_share_name, 'homes'):
> 				continue
> 			share.hosts_deny = shlex.split(value)
> 			share.ucr = True
>@@ -300,9 +301,8 @@
> 
> 	# set share options to -> shares
> 	def _set_options(self, value, share, option):
>-		if match and share and options and value:
>-			if option not in self._shares[share]:
>-				self._shares[share][option] = set()
>+		if share and option and value and option not in self._shares[share]:
>+			self._shares[share][option] = set()
> 
> 			self._shares[share].ucr = True
> 			self._shares[share][option].add(value)

Actions: View | Diff

Attachments on bug 42809: 8175