Merge pull request #7143 from sivel/ansible-sudo-from-root-fix

Allow sudo to another user from root with the ansible command
This commit is contained in:
James Cammarata 2014-04-23 21:11:39 -05:00
commit e9d8f0639f

View file

@ -933,13 +933,13 @@ class Runner(object):
# compare connection user to (su|sudo)_user and disable if the same # compare connection user to (su|sudo)_user and disable if the same
if hasattr(conn, 'user'): if hasattr(conn, 'user'):
if conn.user == sudo_user or conn.user == su_user: if (not su and conn.user == sudo_user) or (su and conn.user == su_user):
sudoable = False sudoable = False
su = False su = False
else: else:
# assume connection type is local if no user attribute # assume connection type is local if no user attribute
this_user = getpass.getuser() this_user = getpass.getuser()
if this_user == sudo_user or this_user == su_user: if (not su and this_user == sudo_user) or (su and this_user == su_user):
sudoable = False sudoable = False
su = False su = False