Merge pull request #13156 from amenonsen/broken-timeout

If ssh died, it's an error, not a timeout

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/ansible/plugins/connection/ssh.py b/lib/ansible/plugins/connection/ssh.py
index b5cce048e3..8bbc031271 100644
--- a/lib/ansible/plugins/connection/ssh.py
+++ b/lib/ansible/plugins/connection/ssh.py
@@ -414,6 +414,10 @@ class Connection(ConnectionBase):
 
             if not rfd:
                 if state <= states.index('awaiting_escalation'):
+                    # If the process has already exited, then it's not really a
+                    # timeout; we'll let the normal error handling deal with it.
+                    if p.poll() is not None:
+                        break
                     self._terminate_process(p)
                     raise AnsibleError('Timeout (%ds) waiting for privilege escalation prompt: %s' % (timeout, stdout))