valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2014.7' into develop

Browse Source
This commit is contained in:
Colton Myers 2014-08-20 18:52:48 -06:00
commit e5fadf15e9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/client/ssh/shell.py
View File

@ -109,7 +109,7 @@ class Shell(object):
if self.passwd: if self.passwd:
options.extend(['PasswordAuthentication=yes', options.extend(['PasswordAuthentication=yes',
'PubkeyAuthentication=no']) 'PubkeyAuthentication=yes'])
else: else:
options.extend(['PasswordAuthentication=no', options.extend(['PasswordAuthentication=no',
'PubkeyAuthentication=yes', 'PubkeyAuthentication=yes',