From 8e3d90e7f38fd0858356e1069b76bd5c1c1026bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Fri, 3 Sep 2021 13:38:39 +0200 Subject: [PATCH] Removed "experimental" from AD group on OS Manager and fix on actor runner --- actor/src/udsactor/windows/runner.py | 8 ++++++-- .../src/uds/osmanagers/WindowsOsManager/windows_domain.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/actor/src/udsactor/windows/runner.py b/actor/src/udsactor/windows/runner.py index 16fc898a..6973b784 100644 --- a/actor/src/udsactor/windows/runner.py +++ b/actor/src/udsactor/windows/runner.py @@ -41,6 +41,8 @@ from .service import UDSActorSvc def setupRecoverService(): svc_name = UDSActorSvc._svc_name_ # pylint: disable=protected-access + hs = None + hscm = None try: hscm = win32service.OpenSCManager(None, None, win32service.SC_MANAGER_ALL_ACCESS) @@ -57,9 +59,11 @@ def setupRecoverService(): } win32service.ChangeServiceConfig2(hs, win32service.SERVICE_CONFIG_FAILURE_ACTIONS, service_failure_actions) finally: - win32service.CloseServiceHandle(hs) + if hs: + win32service.CloseServiceHandle(hs) finally: - win32service.CloseServiceHandle(hscm) + if hscm: + win32service.CloseServiceHandle(hscm) def run() -> None: diff --git a/server/src/uds/osmanagers/WindowsOsManager/windows_domain.py b/server/src/uds/osmanagers/WindowsOsManager/windows_domain.py index 9059539d..a7f19e70 100644 --- a/server/src/uds/osmanagers/WindowsOsManager/windows_domain.py +++ b/server/src/uds/osmanagers/WindowsOsManager/windows_domain.py @@ -100,7 +100,7 @@ class WinDomainOsManager(WindowsOsManager): label=_('Machine Group'), order=7, tooltip=_( - 'Group to which add machines on creation. If empty, no group will be used. (experimental)' + 'Group to which add machines on creation. If empty, no group will be used.' ), tab=_('Advanced'), )