Skip to content

A
ansible
Commit bbe66e76 by Michael DeHaan
Options

Merge pull request #1437 from lorin/sudo-nonroot-bugfix 

Fix chmod occurring as wrong user when sudo as non-root
parents 2191a4d5 38fdc249
Showing with 2 additions and 2 deletions
lib/ansible/runner/__init__.py
...@@ -210,7 +210,8 @@ class Runner(object): ...@@ -210,7 +210,8 @@ class Runner(object):
cmd_mod = "" cmd_mod = ""
if self.sudo and self.sudo_user != 'root': if self.sudo and self.sudo_user != 'root':
# deal with possible umask issues once sudo'ed to other user # deal with possible umask issues once sudo'ed to other user
cmd_mod = "chmod a+r %s; " % remote_module_path cmd_chmod = "chmod a+r %s" % remote_module_path
self._low_level_exec_command(conn, cmd_chmod, tmp, sudoable=False)
cmd = "" cmd = ""
if not is_new_style: if not is_new_style:
...@@ -232,7 +233,6 @@ class Runner(object): ...@@ -232,7 +233,6 @@ class Runner(object):
cmd = shebang.replace("#!","") + " " + cmd cmd = shebang.replace("#!","") + " " + cmd
if tmp.find("tmp") != -1: if tmp.find("tmp") != -1:
cmd = cmd + "; rm -rf %s >/dev/null 2>&1" % tmp cmd = cmd + "; rm -rf %s >/dev/null 2>&1" % tmp
cmd = cmd_mod + cmd
res = self._low_level_exec_command(conn, cmd, tmp, sudoable=True) res = self._low_level_exec_command(conn, cmd, tmp, sudoable=True)
return ReturnData(conn=conn, result=res) return ReturnData(conn=conn, result=res)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment