dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote branch 'netik/master'

This commit is contained in:
Robey Pointer 2011-05-21 18:57:09 -07:00
parent e2add90981 33fd998a94
commit 0a9596aed3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
paramiko/client.py
View File

@ -123,6 +123,7 @@ class SSHClient (object):
self._log_channel = None self._log_channel = None
self._policy = RejectPolicy() self._policy = RejectPolicy()
self._transport = None self._transport = None
self._agent = None
def load_system_host_keys(self, filename=None): def load_system_host_keys(self, filename=None):
""" """
@ -339,6 +340,10 @@ class SSHClient (object):
self._transport.close() self._transport.close()
self._transport = None self._transport = None
if self._agent != None:
self._agent.close()
self._agent = None
def exec_command(self, command, bufsize=-1): def exec_command(self, command, bufsize=-1):
""" """
Execute a command on the SSH server. A new L{Channel} is opened and Execute a command on the SSH server. A new L{Channel} is opened and
@ -436,7 +441,10 @@ class SSHClient (object):
saved_exception = e saved_exception = e
if allow_agent: if allow_agent:
for key in Agent().get_keys(): if self._agent == None:
self._agent = Agent()
for key in self._agent.get_keys():
try: try:
self._log(DEBUG, 'Trying SSH agent key %s' % hexlify(key.get_fingerprint())) self._log(DEBUG, 'Trying SSH agent key %s' % hexlify(key.get_fingerprint()))
self._transport.auth_publickey(username, key) self._transport.auth_publickey(username, key)