diff options
| author | jsg@openbsd.org <jsg@openbsd.org> | 2015-09-02 09:51:12 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-09-03 02:44:41 +0200 |
| commit | f3a3ea180afff080bab82087ee0b60db9fd84f6c (patch) | |
| tree | 4740dcc7adb2acf0a0c994e65ce748d6a9b37714 /krl.c | |
| parent | don't check for yp_match; ok tim@ (diff) | |
| download | openssh-f3a3ea180afff080bab82087ee0b60db9fd84f6c.tar.xz openssh-f3a3ea180afff080bab82087ee0b60db9fd84f6c.zip | |
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 'krl.c')
| -rw-r--r-- | krl.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: krl.c,v 1.33 2015/07/03 03:43:18 djm Exp $ */ +/* $OpenBSD: krl.c,v 1.34 2015/09/02 07:51:12 jsg Exp $ */ #include "includes.h" @@ -723,7 +723,7 @@ ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf, if ((r = sshbuf_put(buf, KRL_MAGIC, sizeof(KRL_MAGIC) - 1)) != 0 || (r = sshbuf_put_u32(buf, KRL_FORMAT_VERSION)) != 0 || (r = sshbuf_put_u64(buf, krl->krl_version)) != 0 || - (r = sshbuf_put_u64(buf, krl->generated_date) != 0) || + (r = sshbuf_put_u64(buf, krl->generated_date)) != 0 || (r = sshbuf_put_u64(buf, krl->flags)) != 0 || (r = sshbuf_put_string(buf, NULL, 0)) != 0 || (r = sshbuf_put_cstring(buf, krl->comment)) != 0) |