diff options
author | jsg@openbsd.org <jsg@openbsd.org> | 2015-09-02 07:51:12 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-09-03 10:44:41 +1000 |
commit | f3a3ea180afff080bab82087ee0b60db9fd84f6c (patch) | |
tree | 4740dcc7adb2acf0a0c994e65ce748d6a9b37714 /authfd.c | |
parent | f498a98cf83feeb7ea01c15cd1c98b3111361f3a (diff) |
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
Diffstat (limited to 'authfd.c')
-rw-r--r-- | authfd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.c,v 1.98 2015/07/03 03:43:18 djm Exp $ */ | 1 | /* $OpenBSD: authfd.c,v 1.99 2015/09/02 07:51:12 jsg 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 |
@@ -454,7 +454,7 @@ ssh_agent_sign(int sock, struct sshkey *key, | |||
454 | (r = sshbuf_put_string(msg, data, datalen)) != 0 || | 454 | (r = sshbuf_put_string(msg, data, datalen)) != 0 || |
455 | (r = sshbuf_put_u32(msg, flags)) != 0) | 455 | (r = sshbuf_put_u32(msg, flags)) != 0) |
456 | goto out; | 456 | goto out; |
457 | if ((r = ssh_request_reply(sock, msg, msg) != 0)) | 457 | if ((r = ssh_request_reply(sock, msg, msg)) != 0) |
458 | goto out; | 458 | goto out; |
459 | if ((r = sshbuf_get_u8(msg, &type)) != 0) | 459 | if ((r = sshbuf_get_u8(msg, &type)) != 0) |
460 | goto out; | 460 | goto out; |