diff --git a/actors/src/udsactor/windows/operations.py b/actors/src/udsactor/windows/operations.py index 7329f746..9e44d9ad 100644 --- a/actors/src/udsactor/windows/operations.py +++ b/actors/src/udsactor/windows/operations.py @@ -215,8 +215,9 @@ def getIdleDuration(): return 0 # if lastInputInfo.dwTime > 1000000000: # Value toooo high, nonsense... # return 0 - millis = ctypes.windll.kernel32.GetTickCount() - lastInputInfo.dwTime # @UndefinedVariable - if millis < 0 or millis > 1000000000: + current = ctypes.c_uint(ctypes.windll.kernel32.GetTickCount()) + millis = current.value - lastInputInfo.dwTime # @UndefinedVariable + if millis < 0: return 0 return millis / 1000.0 except Exception as e: diff --git a/server/src/uds/osmanagers/WindowsOsManager/WinDomainOsManager.py b/server/src/uds/osmanagers/WindowsOsManager/WinDomainOsManager.py index 6d517f24..00e4f0c7 100644 --- a/server/src/uds/osmanagers/WindowsOsManager/WinDomainOsManager.py +++ b/server/src/uds/osmanagers/WindowsOsManager/WinDomainOsManager.py @@ -107,12 +107,15 @@ class WinDomainOsManager(WindowsOsManager): _str = '' try: - uri = "%s://%s:%d" % ('ldap', server[0], server[1]) + uri = "%s://%s" % ('ldaps', server[0]) logger.debug('URI: {0}'.format(uri)) ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER) # Disable certificate check l = ldap.initialize(uri=uri) l.set_option(ldap.OPT_REFERRALS, 0) + # l.set_option(ldap.OPT_PROTOCOL_VERSION, 3) + # l.set_option(ldap.OPT_X_TLS,ldap.OPT_X_TLS_DEMAND) + # l.set_option( ldap.OPT_X_TLS_DEMAND, True ) l.network_timeout = l.timeout = 5 l.protocol_version = ldap.VERSION3