Univention Bugzilla – Bug 53785
remove sambaBlockingLocks from UDM shares/share
Last modified: 2023-06-21 09:24:42 CEST
We should remove sambaBlockingLocks from UDM shares/share. The property is not evaluated anymore since UCS 5.0. We still support mixed environments with UCS 4.4, therefore we don't remove it now. management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py:mapping.register('sambaBlockingLocks', 'univentionShareSambaBlockingLocks', None, univention.admin.mapping.ListToString) management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py: 'sambaBlockingLocks': univention.admin.property( management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py: ['sambaLocking', 'sambaBlockingLocks'], management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py:mapping.register('sambaBlockingLocks', 'univentionShareSambaBlockingLocks', None, univention.admin.mapping.ListToString) Adjust the test cases: test/ucs-test/tests/53_samba-common/61_share_hacking: 'univentionShareSambaBlockingLocks': ['1'], test/ucs-test/tests/64_udm-shares/01_create_fileshare: 'univentionShareSambaBlockingLocks': [properties['sambaBlockingLocks']], test/ucs-test/tests/64_udm-shares/02_create_fileshare_and_connect_via_samba: 'univentionShareSambaBlockingLocks': [properties['sambaBlockingLocks']], test/ucs-test/tests/53_samba-common/10samba-share-options:sambaBlockingLocks/blocking locks/1 test/ucs-test/tests/64_udm-shares/01_create_fileshare: 'sambaBlockingLocks': random.choice(['0', '1']), test/ucs-test/tests/64_udm-shares/01_create_fileshare: 'univentionShareSambaBlockingLocks': [properties['sambaBlockingLocks']], test/ucs-test/tests/64_udm-shares/02_create_fileshare_and_connect_via_samba: 'sambaBlockingLocks': random.choice(['0', '1']), test/ucs-test/tests/64_udm-shares/02_create_fileshare_and_connect_via_samba: 'univentionShareSambaBlockingLocks': [properties['sambaBlockingLocks']], +++ This bug was initially created as a clone of Bug #53711 +++ We removed the deprecated option "blocking locks" with #49898. After an update, this produces the following warning on each univention-s4search (or any other ldbadd, ldbsearch etc.) "WARNING: The "blocking locks" option is deprecated" This has no functional implications, but it lead some of our tests to fail and it might unsettle some costumers.
*** Bug 52299 has been marked as a duplicate of this bug. ***
The MR https://git.knut.univention.de/univention/ucs/-/merge_requests/360 at least removes the from being visible in the UI.
The properties have been removed from the layout. It would be an API change to remove them completely, therefor postpone that to UCS 6.0. univention-directory-manager-modules (15.0.20-9) 100917ad7edb | Bug #53785: remove checkbox "Blocking locks"
Changelog: OK Code review: OK Tests: OK
UCS 5.0-4 has been released: https://docs.software-univention.de/release-notes/5.0-4/en/ If this error occurs again, please use the 'Clone This Bug' option.