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

Fix for issue #353 (handle change in ssh-keygen behaviour)

Browse source 
Prior to openssh 6.4, ssh-keygen -F returned 0 (and no output) when no
host was found. After then, it instead returned 1 and no output. This
revised code behaves correctly with either behaviour. There is
currently no other code path that results in exit(1) and no output.
This commit is contained in:
Matthew Vernon 2015-03-31 17:19:11 +01:00 committed by Matt Clay
parent b90f97442d
commit dd9d5cc670
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/extras/system/known_hosts.py
View file

@ -188,10 +188,14 @@ def search_for_host_key(module,host,key,path,sshkeygen):
replace=False replace=False
if os.path.exists(path)==False: if os.path.exists(path)==False:
return False, False return False, False
#openssh >=6.4 has changed ssh-keygen behaviour such that it returns
#1 if no host is found, whereas previously it returned 0
rc,stdout,stderr=module.run_command([sshkeygen,'-F',host,'-f',path], rc,stdout,stderr=module.run_command([sshkeygen,'-F',host,'-f',path],
check_rc=True) check_rc=False)
if stdout=='': #host not found if stdout=='' and stderr=='' and (rc==0 or rc==1):
return False, False return False, False #host not found, no other errors
if rc!=0: #something went wrong
module.fail_json(msg="ssh-keygen failed (rc=%d,stdout='%s',stderr='%s')" % (rc,stdout,stderr))
#If user supplied no key, we don't want to try and replace anything with it #If user supplied no key, we don't want to try and replace anything with it
if key is None: if key is None: