Description Jan Christoph Ebersbach 2014-03-03 12:01:08 CET

I tried to set the following UCR variable to alter the sysvol configuration:

  ucr set 'samba/share/sysvol/options/root preexec=/usr/bin/logon-logger %U %m %M on'

This resulted in multiple tracebacks because of the undefined variables options and match.  Once I fixed the issues, the script had problems setting options for the sysvol share which isn't defined.

The attached patch works around the issues by correcting the variables and defining any non-existing share.

First traceback:
Script: /etc/univention/templates/scripts/samba.local.config.py
Traceback (most recent call last):
  File "/etc/univention/templates/scripts/samba.local.config.py", line 40, in <module>
    conf.read()
  File "/usr/lib/pymodules/python2.6/univention/lib/share_restrictions.py", line 336, in read
    self.read_ucr()
  File "/usr/lib/pymodules/python2.6/univention/lib/share_restrictions.py", line 326, in read_ucr
    func( ucr[ key ], *match.groups() )
  File "/usr/lib/pymodules/python2.6/univention/lib/share_restrictions.py", line 301, in _set_options
    if match and share and options and value:
NameError: global name 'match' is not defined

Second traceback after removing match:
Script: /etc/univention/templates/scripts/samba.local.config.py
Traceback (most recent call last):
  File "/etc/univention/templates/scripts/samba.local.config.py", line 40, in <module>
    conf.read()
  File "/usr/lib/pymodules/python2.6/univention/lib/share_restrictions.py", line 336, in read
    self.read_ucr()
  File "/usr/lib/pymodules/python2.6/univention/lib/share_restrictions.py", line 326, in read_ucr
    func( ucr[ key ], *match.groups() )
  File "/usr/lib/pymodules/python2.6/univention/lib/share_restrictions.py", line 301, in _set_options
    if share and options and value:
NameError: global name 'options' is not defined

Third traceback after correcting option variable:
Script: /etc/univention/templates/scripts/samba.local.config.py
Traceback (most recent call last):
  File "/etc/univention/templates/scripts/samba.local.config.py", line 40, in <module>
    conf.read()
  File "/usr/lib/pymodules/python2.6/univention/lib/share_restrictions.py", line 336, in read
    self.read_ucr()
  File "/usr/lib/pymodules/python2.6/univention/lib/share_restrictions.py", line 326, in read_ucr
    func( ucr[ key ], *match.groups() )
  File "/usr/lib/pymodules/python2.6/univention/lib/share_restrictions.py", line 302, in _set_options
    if not option in self._shares[ share ]:
KeyError: 'sysvol'