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

Merge pull request #16159 from thatch45/passwd_fix

Browse Source 
Add passwd opts checking to key_opts
This commit is contained in:
Thomas S Hatch 2014-09-25 16:09:06 -06:00
commit 2f524b638c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,8 +84,11 @@ class Shell(object):
''' '''
options = [ options = [
'KbdInteractiveAuthentication=no', 'KbdInteractiveAuthentication=no',
'PasswordAuthentication=no',
] ]
if self.passwd:
options.append('PasswordAuthentication=yes')
else:
options.append('PasswordAuthentication=no')
if self.opts['_ssh_version'] > '4.9': if self.opts['_ssh_version'] > '4.9':
options.append('GSSAPIAuthentication=no') options.append('GSSAPIAuthentication=no')
options.append('ConnectTimeout={0}'.format(self.timeout)) options.append('ConnectTimeout={0}'.format(self.timeout))