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 /monitor.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 'monitor.c')
| -rw-r--r-- | monitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.151 2015/08/21 23:29:31 deraadt Exp $ */ +/* $OpenBSD: monitor.c,v 1.152 2015/09/02 07:51:12 jsg Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -722,7 +722,7 @@ mm_answer_sign(int sock, Buffer *m) fatal("%s: sshbuf_new", __func__); if ((r = sshbuf_put_cstring(sigbuf, proof_req)) != 0 || (r = sshbuf_put_string(sigbuf, session_id2, - session_id2_len) != 0) || + session_id2_len)) != 0 || (r = sshkey_puts(key, sigbuf)) != 0) fatal("%s: couldn't prepare private key " "proof buffer: %s", __func__, ssh_err(r)); |