Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ncclient/ncclient
Browse files Browse the repository at this point in the history
  • Loading branch information
einarnn committed Jul 28, 2018
2 parents 382c233 + 740bd39 commit eb2e5b4
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ncclient/transport/ssh.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,10 @@ def connect(self, host, port=830, timeout=None, unknown_host_cb=default_unknown_
username = config.get("user")
if key_filename is None:
key_filename = config.get("identityfile")
if hostkey_verify:
userknownhostsfile = config.get("userknownhostsfile")
if userknownhostsfile:
self.load_known_hosts(os.path.expanduser(userknownhostsfile))

if username is None:
username = getpass.getuser()
Expand Down

0 comments on commit eb2e5b4

Please sign in to comment.