Index: services/univention-printserver/cups-printers.py =================================================================== --- services/univention-printserver/cups-printers.py (Revision 78483) +++ services/univention-printserver/cups-printers.py (Arbeitskopie) @@ -55,7 +55,6 @@ attributes = ['univentionPrinterSpoolHost', 'univentionPrinterModel', 'univentionPrinterURI', 'univentionPrinterLocation', 'description', 'univentionPrinterSambaName', 'univentionPrinterPricePerPage', 'univentionPrinterPricePerJob', 'univentionPrinterQuotaSupport', 'univentionPrinterGroupMember', 'univentionPrinterACLUsers', 'univentionPrinterACLGroups', 'univentionPrinterACLtype', 'univentionPrinterUseClientDriver', ] EMPTY = ('',) -reload_samba_in_postrun = None def lpadmin(args): @@ -123,8 +122,6 @@ printer_is_group = False quota_support = False samba_force_printername = listener.baseConfig.is_true('samba/force_printername', True) - global reload_samba_in_postrun - reload_samba_in_postrun = True changes = [] @@ -177,7 +174,6 @@ if (filter_match(new) or filter_match(old)): change_affects_this_host = True - reload_samba_in_postrun = True # default, if it isn't done earlier if filter_match(old): if 'cn' in changes or not filter_match(new): @@ -438,12 +434,11 @@ def reload_smbd(): - global reload_samba_in_postrun listener.setuid(0) try: ucr_handlers.commit(listener.configRegistry, ['/etc/samba/smb.conf']) - if os.path.exists('/etc/init.d/samba'): - subprocess.call(('/etc/init.d/samba', 'reload')) + if os.path.exists('/etc/init.d/smbd'): + subprocess.call(('/etc/init.d/smbd', 'reload')) elif os.path.exists('/usr/bin/pkill'): ud.debug(ud.LISTENER, ud.WARN, "cups-printers: pkill -HUP smbd") subprocess.call(('/usr/bin/pkill', '-HUP', 'smbd')) @@ -451,7 +446,6 @@ ud.debug(ud.LISTENER, ud.ERROR, "cups-printers: Cannot reload smbd: Both /etc/init.d/samba and pkill are missing") finally: listener.unsetuid() - reload_samba_in_postrun = False # flag that this has been done. def initialize(): @@ -476,9 +470,3 @@ os.rmdir('/etc/samba/printers.conf.d') finally: listener.unsetuid() - - -def postrun(): - global reload_samba_in_postrun - if reload_samba_in_postrun: - reload_smbd()