EXTRA_PATCHES?=	${FILESDIR}/extra-patch-8647fdc \

		${FILESDIR}/extra-patch-6bf2f45

--- lib/ansible/playbook/play_context.py.orig	2016-01-14 22:33:27 UTC

+++ lib/ansible/playbook/play_context.py

@@ -446,8 +446,10 @@ class PlayContext(Base):

             if self.become_method == 'sudo':

                 # If we have a password, we run sudo with a randomly-generated

-                # prompt set using -p. Otherwise we run it with -n, which makes

+                # prompt set using -p. Otherwise we run it with default -n, which makes

                 # it fail if it would have prompted for a password.

+                # Cannot rely on -n as it can be removed from defaults, which should be

+                # done for older versions of sudo that do not support the option.

                 #

                 # Passing a quoted compound command to sudo (or sudo -s)

                 # directly doesn't work, so we shellquote it with pipes.quote()

@@ -463,12 +465,14 @@ class PlayContext(Base):

             elif self.become_method == 'su':

+                # passing code ref to examine prompt as simple string comparisson isn't good enough with su

                 def detect_su_prompt(data):

                     SU_PROMPT_LOCALIZATIONS_RE = re.compile("|".join(['(\w+\'s )?' + x + ' ?: ?' for x in SU_PROMPT_LOCALIZATIONS]), flags=re.IGNORECASE)

                     return bool(SU_PROMPT_LOCALIZATIONS_RE.match(data))

-

                 prompt = detect_su_prompt

-                becomecmd = '%s %s %s -c "%s -c %s"' % (exe, flags, self.become_user, executable, success_cmd)

+

+                su_success_cmd =  '%s -c %s' % (executable, success_cmd) # this is here cause su too succeptible to overquoting

+                becomecmd = '%s %s %s -c %s' % (exe, flags, self.become_user, su_success_cmd) #works with sh

             elif self.become_method == 'pbrun':

--- lib/ansible/plugins/action/__init__.py.orig	2016-01-14 22:33:27 UTC

+++ lib/ansible/plugins/action/__init__.py

@@ -475,8 +475,7 @@ class ActionBase(with_metaclass(ABCMeta,

         display.debug("done with _execute_module (%s, %s)" % (module_name, module_args))

         return data

-    def _low_level_execute_command(self, cmd, sudoable=True, in_data=None,

-            executable=None, encoding_errors='replace'):

+    def _low_level_execute_command(self, cmd, sudoable=True, in_data=None, executable=C.DEFAULT_EXECUTABLE, encoding_errors='replace'):

         '''

         This is the function which executes the low level shell command, which

         may be commands to create/remove directories for temporary files, or to

@@ -492,7 +491,7 @@ class ActionBase(with_metaclass(ABCMeta,

         '''

         if executable is not None:

-            cmd = executable + ' -c ' + cmd

+            cmd = executable + ' -c ' + pipes.quote(cmd)

         display.debug("_low_level_execute_command(): starting")

         if not cmd: