cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Fix authentication failure with paramiko when using password mode (#33303)

Browse source 
- break out of loop when paramiko stream is closed
This commit is contained in:
Kedar K 2017-11-27 18:47:17 +05:30 committed by Ricardo Carrillo Cruz
parent 0e0470bc49
commit e65ef09aa9
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/plugins/connection/network_cli.py
View file

@ -162,7 +162,7 @@ class Connection(ConnectionBase):
return
p = connection_loader.get('paramiko', self._play_context, '/dev/null')
p.set_options(direct={'look_for_keys': bool(self._play_context.password and not self._play_context.private_key_file)})
p.set_options(direct={'look_for_keys': not bool(self._play_context.password and not self._play_context.private_key_file)})
p.force_persistence = self.force_persistence
ssh = p._connect()
@ -261,6 +261,10 @@ class Connection(ConnectionBase):
while True:
data = self._ssh_shell.recv(256)
# when a channel stream is closed, received data will be empty
if not data:
break
recv.write(data)
offset = recv.tell() - 256 if recv.tell() > 256 else 0
recv.seek(offset)