Attachment #7460 for bug #40599

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




			short_description=_('Valid users or groups'),
			long_description='',
			syntax=univention.admin.syntax.string,
			multivalue=1,
			options=['samba'],
			required=0,
			may_change=1,

			short_description=_('Invalid users or groups'),
			long_description='',
			syntax=univention.admin.syntax.string,
			multivalue=1,
			options=['samba'],
			required=0,
			may_change=1,

	return lst


def unmapSambaShareUsers(value):
	if not value:
		return []
	value = value[0]
	p = re.compile(',(?=(?:[^"]*"[^"]*")*[^"]*$)')
	return [x[1:-1].replace('\\"', '"') if x.startswith('"') and x.endswith('"') else x for x in map(str.strip, p.split(value))]


def mapSambaShareUsers(value):
	return ', '.join('"%s"' % (v.replace('"', '\"'),) if ' ' in v else v for v in value)


def insertQuotes(value):
	'Turns @group name, user name into @"group name", "user name"'


mapping.register('sambaFakeOplocks', 'univentionShareSambaFakeOplocks', None, univention.admin.mapping.ListToString)
mapping.register('sambaBlockSize', 'univentionShareSambaBlockSize', None, univention.admin.mapping.ListToString)
mapping.register('sambaCscPolicy', 'univentionShareSambaCscPolicy', None, univention.admin.mapping.ListToString)
mapping.register('sambaValidUsers', 'univentionShareSambaValidUsers', mapSambaShareUsers, unmapSambaShareUsers)
mapping.register('sambaInvalidUsers', 'univentionShareSambaInvalidUsers', mapSambaShareUsers, unmapSambaShareUsers)
mapping.register('sambaHostsAllow', 'univentionShareSambaHostsAllow' )
mapping.register('sambaHostsDeny', 'univentionShareSambaHostsDeny' )
mapping.register('sambaForceUser', 'univentionShareSambaForceUser', None, univention.admin.mapping.ListToString)

Return to bug 40599

Lines 482-488 class cscPolicy(univention.admin.syntax.select): Link Here

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py (-4 / +16 lines)
482	short_description=_('Valid users or groups'),	482	short_description=_('Valid users or groups'),
483	long_description='',	483	long_description='',
484	syntax=univention.admin.syntax.string,	484	syntax=univention.admin.syntax.string,
485	multivalue=0,	485	multivalue=1,
486	options=['samba'],	486	options=['samba'],
487	required=0,	487	required=0,
488	may_change=1,	488	may_change=1,
Lines 492-498 class cscPolicy(univention.admin.syntax.select): Link Here
492	short_description=_('Invalid users or groups'),	492	short_description=_('Invalid users or groups'),
493	long_description='',	493	long_description='',
494	syntax=univention.admin.syntax.string,	494	syntax=univention.admin.syntax.string,
495	multivalue=0,	495	multivalue=1,
496	options=['samba'],	496	options=['samba'],
497	required=0,	497	required=0,
498	may_change=1,	498	may_change=1,
Lines 734-739 def unmapKeyAndValue(old): Link Here
734	return lst	734	return lst
735		735
736		736
		737	def unmapSambaShareUsers(value):
		738	if not value:
		739	return []
		740	value = value[0]
		741	p = re.compile(',(?=(?:[^"]"[^"]")[^"]$)')
		742	return [x[1:-1].replace('\\"', '"') if x.startswith('"') and x.endswith('"') else x for x in map(str.strip, p.split(value))]
		743
		744
		745	def mapSambaShareUsers(value):
		746	return ', '.join('"%s"' % (v.replace('"', '\"'),) if ' ' in v else v for v in value)
		747
		748
737	def insertQuotes(value):	749	def insertQuotes(value):
738	'Turns @group name, user name into @"group name", "user name"'	750	'Turns @group name, user name into @"group name", "user name"'
739		751
Lines 789-796 def insertQuotes(value): Link Here
789	mapping.register('sambaFakeOplocks', 'univentionShareSambaFakeOplocks', None, univention.admin.mapping.ListToString)	801	mapping.register('sambaFakeOplocks', 'univentionShareSambaFakeOplocks', None, univention.admin.mapping.ListToString)
790	mapping.register('sambaBlockSize', 'univentionShareSambaBlockSize', None, univention.admin.mapping.ListToString)	802	mapping.register('sambaBlockSize', 'univentionShareSambaBlockSize', None, univention.admin.mapping.ListToString)
791	mapping.register('sambaCscPolicy', 'univentionShareSambaCscPolicy', None, univention.admin.mapping.ListToString)	803	mapping.register('sambaCscPolicy', 'univentionShareSambaCscPolicy', None, univention.admin.mapping.ListToString)
792	mapping.register('sambaValidUsers', 'univentionShareSambaValidUsers', None, univention.admin.mapping.ListToString )	804	mapping.register('sambaValidUsers', 'univentionShareSambaValidUsers', mapSambaShareUsers, unmapSambaShareUsers)
793	mapping.register('sambaInvalidUsers', 'univentionShareSambaInvalidUsers', None, univention.admin.mapping.ListToString )	805	mapping.register('sambaInvalidUsers', 'univentionShareSambaInvalidUsers', mapSambaShareUsers, unmapSambaShareUsers)
794	mapping.register('sambaHostsAllow', 'univentionShareSambaHostsAllow' )	806	mapping.register('sambaHostsAllow', 'univentionShareSambaHostsAllow' )
795	mapping.register('sambaHostsDeny', 'univentionShareSambaHostsDeny' )	807	mapping.register('sambaHostsDeny', 'univentionShareSambaHostsDeny' )
796	mapping.register('sambaForceUser', 'univentionShareSambaForceUser', None, univention.admin.mapping.ListToString)	808	mapping.register('sambaForceUser', 'univentionShareSambaForceUser', None, univention.admin.mapping.ListToString)