Index: univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py
===================================================================
--- univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py	(Revision 73582)
+++ univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py	(Arbeitskopie)
@@ -324,54 +324,6 @@
 			dontsearch=1,
 			default='0'
 		),
-	'sambaSecurityMode': univention.admin.property(
-			short_description=_('Security mode'),
-			long_description=_('This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the UNIX permission on a file using the native NT security dialog box. This parameter is applied as a mask (AND\'ed with) to the changed permission bits, thus preventing any bits not in this mask from being modified. Essentially, zero bits in this mask may be treated as a set of bits the user is not allowed to change.'),
-			syntax=univention.admin.syntax.UNIX_AccessRight,
-			multivalue=0,
-			options=['samba'],
-			required=0,
-			may_change=1,
-			identifies=0,
-			dontsearch=1,
-			default='0777'
-		),
-	'sambaDirectorySecurityMode': univention.admin.property(
-			short_description=_('Directory security mode'),
-			long_description=_('This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the UNIX permission on a directory using the native NT security dialog box. This parameter is applied as a mask (AND\'ed with) to the changed permission bits, thus preventing any bits not in this mask from being modified. Essentially, zero bits in this mask may be treated as a set of bits the user is not allowed to change.'),
-			syntax=univention.admin.syntax.UNIX_AccessRight,
-			multivalue=0,
-			options=['samba'],
-			required=0,
-			may_change=1,
-			identifies=0,
-			dontsearch=1,
-			default='0777'
-		),
-	'sambaForceSecurityMode': univention.admin.property(
-			short_description=_('Force security mode'),
-			long_description=_('This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the UNIX permission on a file using the native NT security dialog box. This parameter is applied as a mask (OR\'ed with) to the changed permission bits, thus forcing any bits in this mask that the user may have modified to be on. Essentially, one bits in this mask may be treated as a set of bits that, when modifying security on a file, the user has always set to be \'on\'.'),
-			syntax=univention.admin.syntax.UNIX_AccessRight,
-			multivalue=0,
-			options=['samba'],
-			required=0,
-			may_change=1,
-			identifies=0,
-			dontsearch=1,
-			default='0'
-		),
-	'sambaForceDirectorySecurityMode': univention.admin.property(
-			short_description=_('Force directory security mode'),
-			long_description=_('This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the UNIX permission on a directory using the native NT security dialog box. This parameter is applied as a mask (OR\'ed with) to the changed permission bits, thus forcing any bits in this mask that the user may have modified to be on. Essentially, one bits in this mask may be treated as a set of bits that, when modifying security on a directory, the user has always set to be \'on\'.'),
-			syntax=univention.admin.syntax.UNIX_AccessRight,
-			multivalue=0,
-			options=['samba'],
-			required=0,
-			may_change=1,
-			identifies=0,
-			dontsearch=1,
-			default='0'
-		),
 	'sambaLocking': univention.admin.property(
 			short_description=_('Locking'),
 			long_description=_('This controls whether or not locking will be performed by the server in response to lock requests from the client. Be careful about disabling locking, as lack of locking may result in data corruption.'),
@@ -690,8 +642,6 @@
 		 layout = [
 			[ 'sambaCreateMode', 'sambaDirectoryMode' ],
 			[ 'sambaForceCreateMode', 'sambaForceDirectoryMode' ],
-			[ 'sambaSecurityMode', 'sambaDirectorySecurityMode' ],
-			[ 'sambaForceSecurityMode', 'sambaForceDirectorySecurityMode' ],
 	] ),
 	Tab( _( 'Samba options' ), _( 'Samba options' ), advanced = True,
 		layout = [
@@ -779,10 +729,6 @@
 mapping.register('sambaDirectoryMode', 'univentionShareSambaDirectoryMode', None, univention.admin.mapping.ListToString)
 mapping.register('sambaForceCreateMode', 'univentionShareSambaForceCreateMode', None, univention.admin.mapping.ListToString)
 mapping.register('sambaForceDirectoryMode', 'univentionShareSambaForceDirectoryMode', None, univention.admin.mapping.ListToString)
-mapping.register('sambaSecurityMode', 'univentionShareSambaSecurityMode', None, univention.admin.mapping.ListToString)
-mapping.register('sambaDirectorySecurityMode', 'univentionShareSambaDirectorySecurityMode', None, univention.admin.mapping.ListToString)
-mapping.register('sambaForceSecurityMode', 'univentionShareSambaForceSecurityMode', None, univention.admin.mapping.ListToString)
-mapping.register('sambaForceDirectorySecurityMode', 'univentionShareSambaForceDirectorySecurityMode', None, univention.admin.mapping.ListToString)
 mapping.register('sambaLocking', 'univentionShareSambaLocking', None, univention.admin.mapping.ListToString)
 mapping.register('sambaBlockingLocks', 'univentionShareSambaBlockingLocks', None, univention.admin.mapping.ListToString)
 mapping.register('sambaStrictLocking', 'univentionShareSambaStrictLocking', None, univention.admin.mapping.ListToString)