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

- djm@cvs.openbsd.org 2012/08/17 01:25:58 

[ssh-keygen.c]
     print details of which host lines were deleted when using
     "ssh-keygen -R host"; ok markus@
This commit is contained in:
Darren Tucker 2012-09-06 21:20:39 +10:00
parent ae608bdd83
commit f09a8a6c6d
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -13,6 +13,10 @@
[kex.c] [kex.c]
add some comments about better handling first-KEX-follows notifications add some comments about better handling first-KEX-follows notifications
from the server. Nothing uses these right now. No binary change from the server. Nothing uses these right now. No binary change
- djm@cvs.openbsd.org 2012/08/17 01:25:58
[ssh-keygen.c]
print details of which host lines were deleted when using
"ssh-keygen -R host"; ok markus@
20120830 20120830
- (dtucker) [moduli] Import new moduli file. - (dtucker) [moduli] Import new moduli file.

22
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.216 2012/07/06 06:38:03 jmc Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.217 2012/08/17 01:25:58 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1088,8 +1088,14 @@ do_known_hosts(struct passwd *pw, const char *name)
ca ? " (CA key)" : ""); ca ? " (CA key)" : "");
printhost(out, cp, pub, ca, 0); printhost(out, cp, pub, ca, 0);
} }
if (delete_host && !c && !ca) if (delete_host) {
printhost(out, cp, pub, ca, 0); if (!c && !ca)
printhost(out, cp, pub, ca, 0);
else
printf("# Host %s found: "
"line %d type %s\n", name,
num, key_type(pub));
}
} else if (hash_hosts) } else if (hash_hosts)
printhost(out, cp, pub, ca, 0); printhost(out, cp, pub, ca, 0);
} else { } else {
@ -1104,8 +1110,14 @@ do_known_hosts(struct passwd *pw, const char *name)
printhost(out, name, pub, printhost(out, name, pub,
ca, hash_hosts && !ca); ca, hash_hosts && !ca);
} }
if (delete_host && !c && !ca) if (delete_host) {
printhost(out, cp, pub, ca, 0); if (!c && !ca)
printhost(out, cp, pub, ca, 0);
else
printf("# Host %s found: "
"line %d type %s\n", name,
num, key_type(pub));
}
} else if (hash_hosts) { } else if (hash_hosts) {
for (cp2 = strsep(&cp, ","); for (cp2 = strsep(&cp, ",");
cp2 != NULL && *cp2 != '\0'; cp2 != NULL && *cp2 != '\0';