tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: make ssh-keyscan return a non-zero exit status if it 

finds no keys. bz#2903

OpenBSD-Commit-ID: 89f1081fb81d950ebb48e6e73d21807b2723d488
This commit is contained in:
djm@openbsd.org 2019-01-26 22:35:01 +00:00 committed by Damien Miller
parent 05b9a46670
commit c2c18a3968
1 changed files with 6 additions and 2 deletions

8
ssh-keyscan.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keyscan.c,v 1.125 2019/01/21 10:38:54 djm Exp $ */
/* $OpenBSD: ssh-keyscan.c,v 1.126 2019/01/26 22:35:01 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@ -70,6 +70,8 @@ int hash_hosts = 0; /* Hash hostname on output */
int print_sshfp = 0; /* Print SSHFP records instead of known_hosts */
int found_one = 0; /* Successfully found a key */
#define MAXMAXFD 256
/* The number of seconds after which to give up on a TCP connection */
@ -287,6 +289,8 @@ keyprint_one(const char *host, struct sshkey *key)
char *hostport;
const char *known_host, *hashed;
found_one = 1;
if (print_sshfp) {
export_dns_rr(host, key, stdout, 0);
return;
@ -802,5 +806,5 @@ main(int argc, char **argv)
while (ncon > 0)
conloop();
return (0);
return found_one ? 0 : 1;
}