--- ./lib/ansible/runner/connection_plugins/paramiko_ssh.py.orig	2014-05-23 16:37:57.000000000 -0400

+++ ./lib/ansible/runner/connection_plugins/paramiko_ssh.py	2014-05-31 09:13:44.137967396 -0400

@@ -31,6 +31,7 @@

 import logging

 import traceback

 import fcntl

+import re

 import sys

 from termios import tcflush, TCIFLUSH

 from binascii import hexlify

@@ -210,12 +211,17 @@

                 shcmd, prompt, success_key = utils.make_sudo_cmd(sudo_user, executable, cmd)

             elif self.runner.su or su:

                 shcmd, prompt, success_key = utils.make_su_cmd(su_user, executable, cmd)

+                prompt_re = re.compile(prompt)

             vvv("EXEC %s" % shcmd, host=self.host)

             sudo_output = ''

             try:

                 chan.exec_command(shcmd)

                 if self.runner.sudo_pass or self.runner.su_pass:

-                    while not sudo_output.endswith(prompt) and success_key not in sudo_output:

+                    while True:

+                        if success_key in sudo_output or \

+                            (self.runner.sudo_pass and sudo_output.endswith(prompt)) or \

+                            (self.runner.su_pass and prompt_re.match(sudo_output)):

+                            break

                         chunk = chan.recv(bufsize)

                         if not chunk:

                             if 'unknown user' in sudo_output:

--- ./lib/ansible/runner/connection_plugins/ssh.py.orig	2014-05-23 16:37:57.000000000 -0400

+++ ./lib/ansible/runner/connection_plugins/ssh.py	2014-05-31 09:13:44.138967431 -0400

@@ -17,6 +17,7 @@

 #

 import os

+import re

 import subprocess

 import shlex

 import pipes

@@ -263,6 +264,7 @@

         if su and su_user:

             sudocmd, prompt, success_key = utils.make_su_cmd(su_user, executable, cmd)

+            prompt_re = re.compile(prompt)

             ssh_cmd.append(sudocmd)

         elif not self.runner.sudo or not sudoable:

             prompt = None

@@ -303,7 +305,12 @@

             sudo_output = ''

             sudo_errput = ''

-            while not sudo_output.endswith(prompt) and success_key not in sudo_output:

+            while True:

+                if success_key in sudo_output or \

+                    (self.runner.sudo_pass and sudo_output.endswith(prompt)) or \

+                    (self.runner.su_pass and prompt_re.match(sudo_output)):

+                    break

+

                 rfd, wfd, efd = select.select([p.stdout, p.stderr], [],

                                               [p.stdout], self.runner.timeout)

                 if p.stderr in rfd:

--- ./lib/ansible/utils/__init__.py.orig	2014-05-23 16:37:57.000000000 -0400

+++ ./lib/ansible/utils/__init__.py	2014-05-31 09:13:44.140967223 -0400

@@ -952,9 +952,9 @@

     """

     # TODO: work on this function

     randbits = ''.join(chr(random.randint(ord('a'), ord('z'))) for x in xrange(32))

-    prompt = 'assword: '

+    prompt = '[Pp]assword: ?$'

     success_key = 'SUDO-SUCCESS-%s' % randbits

-    sudocmd = '%s %s %s %s -c %s' % (

+    sudocmd = '%s %s %s -c "%s -c %s"' % (

         C.DEFAULT_SU_EXE, C.DEFAULT_SU_FLAGS, su_user, executable or '$SHELL',

         pipes.quote('echo %s; %s' % (success_key, cmd))

     )

--- ./test/units/TestUtils.py.orig	2014-05-23 16:37:57.000000000 -0400

+++ ./test/units/TestUtils.py	2014-05-31 09:13:44.141967206 -0400

@@ -3,6 +3,7 @@

 import unittest

 import os

 import os.path

+import re

 import tempfile

 import yaml

 import passlib.hash

@@ -511,8 +512,8 @@

         cmd = ansible.utils.make_su_cmd('root', '/bin/sh', '/bin/ls')

         self.assertTrue(isinstance(cmd, tuple))

         self.assertEqual(len(cmd), 3)

-        self.assertTrue(' root /bin/sh' in cmd[0])

-        self.assertTrue(cmd[1] == 'assword: ')

+        self.assertTrue(' root -c "/bin/sh' in cmd[0])

+        self.assertTrue(re.compile(cmd[1]))

         self.assertTrue('echo SUDO-SUCCESS-' in cmd[0] and cmd[2].startswith('SUDO-SUCCESS-'))

     def test_to_unicode(self):