Fixes #5030 compare connection user and sudo user and disable sudo if identical
This commit is contained in:
parent
12ed39ef7b
commit
b6879ca2bd
1 changed files with 6 additions and 4 deletions
|
@ -762,10 +762,12 @@ class Runner(object):
|
||||||
executable = C.DEFAULT_EXECUTABLE
|
executable = C.DEFAULT_EXECUTABLE
|
||||||
|
|
||||||
sudo_user = self.sudo_user
|
sudo_user = self.sudo_user
|
||||||
|
|
||||||
if self.remote_user == sudo_user:
|
# compare connection user to sudo_user and disable if the same
|
||||||
sudoable = False
|
if hasattr(conn, 'user'):
|
||||||
|
if conn.user == sudo_user:
|
||||||
|
sudoable = False
|
||||||
|
|
||||||
rc, stdin, stdout, stderr = conn.exec_command(cmd, tmp, sudo_user, sudoable=sudoable, executable=executable)
|
rc, stdin, stdout, stderr = conn.exec_command(cmd, tmp, sudo_user, sudoable=sudoable, executable=executable)
|
||||||
|
|
||||||
if type(stdout) not in [ str, unicode ]:
|
if type(stdout) not in [ str, unicode ]:
|
||||||
|
|
Loading…
Reference in a new issue