summaryrefslogtreecommitdiff
path: root/authfd.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2020-03-06 18:24:39 +0000
committerDamien Miller <djm@mindrot.org>2020-03-13 13:18:09 +1100
commitbc30b446841fc16e50ed6e75c56ccfbd37b9f281 (patch)
treee2188757438913bef1fcb0b77ed6d4f2e5630770 /authfd.c
parent7b4f70ddeb59f35283d77d8d9c834ca58f8cf436 (diff)
upstream: ssh_fetch_identitylist() returns the return value from
ssh_request_reply() so we should also check against != 0 ok djm OpenBSD-Commit-ID: 28d0028769d03e665688c61bb5fd943e18614952
Diffstat (limited to 'authfd.c')
-rw-r--r--authfd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/authfd.c b/authfd.c
index 9831a1290..4b647a628 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.c,v 1.122 2020/02/26 13:40:09 jsg Exp $ */ 1/* $OpenBSD: authfd.c,v 1.123 2020/03/06 18:24:39 markus Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -342,7 +342,7 @@ ssh_agent_has_key(int sock, struct sshkey *key)
342 size_t i; 342 size_t i;
343 struct ssh_identitylist *idlist = NULL; 343 struct ssh_identitylist *idlist = NULL;
344 344
345 if ((r = ssh_fetch_identitylist(sock, &idlist)) < 0) { 345 if ((r = ssh_fetch_identitylist(sock, &idlist)) != 0) {
346 return r; 346 return r;
347 } 347 }
348 348