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

Merge pull request #24424 from skizunov/develop2

Browse source 
On Windows running salt with admin privileges now authenticates
This commit is contained in:
Thomas S Hatch 2015-06-05 18:18:28 -06:00
commit dccb83e1ca
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/utils/__init__.py
View file

@ -338,11 +338,15 @@ def get_specific_user():
more specific
'''
user = get_user()
env_vars = ('SUDO_USER',)
if user == 'root':
for evar in env_vars:
if evar in os.environ:
return 'sudo_{0}'.format(os.environ[evar])
if is_windows():
if ctypes.windll.shell32.IsUserAnAdmin() != 0:
return 'sudo_{0}'.format(user)
else:
env_vars = ('SUDO_USER',)
if user == 'root':
for evar in env_vars:
if evar in os.environ:
return 'sudo_{0}'.format(os.environ[evar])
return user