From: markus@openbsd.org <markus@openbsd.org>
Date: Fri, 6 Mar 2020 18:24:39 +0000 (+0000)
Subject: upstream: ssh_fetch_identitylist() returns the return value from
X-Git-Tag: V_8_3_P1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc30b446841fc16e50ed6e75c56ccfbd37b9f281;p=thirdparty%2Fopenssh-portable.git

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
---

diff --git a/authfd.c b/authfd.c
index 9831a1290..4b647a628 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.122 2020/02/26 13:40:09 jsg Exp $ */
+/* $OpenBSD: authfd.c,v 1.123 2020/03/06 18:24:39 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -342,7 +342,7 @@ ssh_agent_has_key(int sock, struct sshkey *key)
 	size_t i;
 	struct ssh_identitylist *idlist = NULL;
 
-	if ((r = ssh_fetch_identitylist(sock, &idlist)) < 0) {
+	if ((r = ssh_fetch_identitylist(sock, &idlist)) != 0) {
 		return r;
 	}