diff options
author | naddy@openbsd.org <naddy@openbsd.org> | 2017-05-05 10:42:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:27 +1000 |
commit | 3e371bd2124427403971db853fb2e36ce789b6fd (patch) | |
tree | d05946a4ef052a51cb1c5f867669961e661bbdb0 /sshconnect2.c | |
parent | 2e9c324b3a7f15c092d118c2ac9490939f6228fd (diff) |
upstream commit
more simplification and removal of SSHv1-related code;
ok djm@
Upstream-ID: d2f041aa0b79c0ebd98c68a01e5a0bfab2cf3b55
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 393353db5..1b79253da 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.257 2017/04/30 23:18:44 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.258 2017/05/05 10:42:49 naddy Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1345,7 +1345,7 @@ pubkey_prepare(Authctxt *authctxt) | |||
1345 | if (r != SSH_ERR_AGENT_NOT_PRESENT) | 1345 | if (r != SSH_ERR_AGENT_NOT_PRESENT) |
1346 | debug("%s: ssh_get_authentication_socket: %s", | 1346 | debug("%s: ssh_get_authentication_socket: %s", |
1347 | __func__, ssh_err(r)); | 1347 | __func__, ssh_err(r)); |
1348 | } else if ((r = ssh_fetch_identitylist(agent_fd, 2, &idlist)) != 0) { | 1348 | } else if ((r = ssh_fetch_identitylist(agent_fd, &idlist)) != 0) { |
1349 | if (r != SSH_ERR_AGENT_NO_IDENTITIES) | 1349 | if (r != SSH_ERR_AGENT_NO_IDENTITIES) |
1350 | debug("%s: ssh_fetch_identitylist: %s", | 1350 | debug("%s: ssh_fetch_identitylist: %s", |
1351 | __func__, ssh_err(r)); | 1351 | __func__, ssh_err(r)); |