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_function): handle other language

Browse source
This commit is contained in:
Alkivi 2016-12-14 12:44:50 +01:00 • committed by rallytime
parent 9e35f5dd08
commit e602f17e3d
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/utils/win_functions.py
View file

@ -142,9 +142,16 @@ def get_current_user():
'''
try:
user_name = win32api.GetUserNameEx(win32api.NameSamCompatible)
if user_name[-1] == '$' and win32api.GetUserName() == 'SYSTEM':
if user_name[-1] == '$':
# Make the system account easier to identify.
user_name = 'SYSTEM'
# 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':
user_name = 'SYSTEM'
except pywintypes.error as exc:
raise CommandExecutionError(
'Failed to get current user: {0}'.format(exc[2]))