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 commit 

ignore v1 errors on ssh-add -D; only try v2 keys on
 -l/-L (unless WITH_SSH1) ok djm@
This commit is contained in:
markus@openbsd.org 2015-03-25 19:29:58 +00:00 committed by Damien Miller
parent 5f57e77f91
commit 47842f71e3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssh-add.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-add.c,v 1.120 2015/02/21 21:46:57 halex Exp $ */ /* $OpenBSD: ssh-add.c,v 1.121 2015/03/25 19:29:58 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -164,11 +164,10 @@ delete_all(int agent_fd)
{ {
int ret = -1; int ret = -1;
if (ssh_remove_all_identities(agent_fd, 1) == 0) if (ssh_remove_all_identities(agent_fd, 2) == 0)
ret = 0; ret = 0;
/* ignore error-code for ssh2 */ /* ignore error-code for ssh1 */
/* XXX revisit */ ssh_remove_all_identities(agent_fd, 1);
ssh_remove_all_identities(agent_fd, 2);
if (ret == 0) if (ret == 0)
fprintf(stderr, "All identities removed.\n"); fprintf(stderr, "All identities removed.\n");
@ -364,11 +363,16 @@ static int
list_identities(int agent_fd, int do_fp) list_identities(int agent_fd, int do_fp)
{ {
char *fp; char *fp;
int version, r, had_identities = 0; int r, had_identities = 0;
struct ssh_identitylist *idlist; struct ssh_identitylist *idlist;
size_t i; size_t i;
#ifdef WITH_SSH1
int version = 1;
#else
int version = 2;
#endif
for (version = 1; version <= 2; version++) { for (; version <= 2; version++) {
if ((r = ssh_fetch_identitylist(agent_fd, version, if ((r = ssh_fetch_identitylist(agent_fd, version,
&idlist)) != 0) { &idlist)) != 0) {
if (r != SSH_ERR_AGENT_NO_IDENTITIES) if (r != SSH_ERR_AGENT_NO_IDENTITIES)