From f3a3ea180afff080bab82087ee0b60db9fd84f6c Mon Sep 17 00:00:00 2001 From: "jsg@openbsd.org" Date: Wed, 2 Sep 2015 07:51:12 +0000 Subject: upstream commit Fix occurrences of "r = func() != 0" which result in the wrong error codes being returned due to != having higher precedence than =. ok deraadt@ markus@ Upstream-ID: 5fc35c9fc0319cc6fca243632662d2f06b5fd840 --- authfd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'authfd.c') diff --git a/authfd.c b/authfd.c index eaa14264..12bf1251 100644 --- a/authfd.c +++ b/authfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfd.c,v 1.98 2015/07/03 03:43:18 djm Exp $ */ +/* $OpenBSD: authfd.c,v 1.99 2015/09/02 07:51:12 jsg Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -454,7 +454,7 @@ ssh_agent_sign(int sock, struct sshkey *key, (r = sshbuf_put_string(msg, data, datalen)) != 0 || (r = sshbuf_put_u32(msg, flags)) != 0) goto out; - if ((r = ssh_request_reply(sock, msg, msg) != 0)) + if ((r = ssh_request_reply(sock, msg, msg)) != 0) goto out; if ((r = sshbuf_get_u8(msg, &type)) != 0) goto out; -- cgit v1.2.1