saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(win_functions): syntax

Browse source
This commit is contained in:
Alkivi 2016-12-16 11:22:39 +01:00 • committed by rallytime
parent e602f17e3d
commit 4b6c5438e3
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/utils/win_functions.py
View file

@ -146,11 +146,9 @@ def get_current_user():
# Make the system account easier to identify.
# Fetch sid so as to handle other language than english
test_user = win32api.GetUserName()
sid, d, t = win32security.LookupAccountName('', test_user)
real_sid = user = win32security.ConvertSidToStringSid(sid)
if test_user == 'SYSTEM':
user_name = 'SYSTEM'
elif real_sid == 'S-1-5-18':
elif get_sid_from_name(test_user) == 'S-1-5-18':
user_name = 'SYSTEM'
except pywintypes.error as exc:
raise CommandExecutionError(