diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-09-02 07:51:13 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-09-02 07:51:13 +0000 |
| commit | 37ab3a08269e30a0e6536f158ac31efbe126e60f (patch) | |
| tree | 8be68ca0ccf333007d85f6dd92f80dcde08a14fb /usr.bin/ssh/monitor.c | |
| parent | 6deb30a9b50dda4b4e85d09eab0e8dace609ed92 (diff) | |
Fix occurrences of "r = func() != 0" which result in the wrong error
codes being returned due to != having higher precedence than =.
ok deraadt@ markus@
Diffstat (limited to 'usr.bin/ssh/monitor.c')
| -rw-r--r-- | usr.bin/ssh/monitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c index 05f8900795b..81dcb86e9a3 100644 --- a/usr.bin/ssh/monitor.c +++ b/usr.bin/ssh/monitor.c @@ -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> @@ -626,7 +626,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)); |