summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2015-09-05 09:38:23 +0000
committerjsg <jsg@openbsd.org>2015-09-05 09:38:23 +0000
commit54baf1aaf689530344dad21f273614fb3ac5cea7 (patch)
treee3c9dfd187d0a3ac96c0fd55dd534964b259e3b7 /usr.sbin
parentSupport for xterm-compatible SGR escapes 39 and 49 (reset fg/bg colour to (diff)
downloadwireguard-openbsd-54baf1aaf689530344dad21f273614fb3ac5cea7.tar.xz
wireguard-openbsd-54baf1aaf689530344dad21f273614fb3ac5cea7.zip
Avoid unintended problems with operator precedence when doing an
assignment and comparison. ok deraadt@ looks correct millert@ jung@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/rpc.lockd/test.c6
-rw-r--r--usr.sbin/unbound/libunbound/libunbound.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index 176291aba91..8a6dce685d9 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test.c,v 1.6 2013/04/19 05:06:21 deraadt Exp $ */
+/* $OpenBSD: test.c,v 1.7 2015/09/05 09:38:23 jsg Exp $ */
#include <rpc/rpc.h>
#include <rpcsvc/nlm_prot.h>
@@ -27,8 +27,8 @@ nlm_lock_1(struct nlm_lockargs *argp, CLIENT *clnt)
static nlm_res res;
bzero((char *) &res, sizeof(res));
- if (st = clnt_call(clnt, NLM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ if ((st = clnt_call(clnt, NLM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
+ &res, TIMEOUT)) != RPC_SUCCESS) {
printf("clnt_call returns %d\n", st);
clnt_perror(clnt, "humbug");
return (NULL);
diff --git a/usr.sbin/unbound/libunbound/libunbound.c b/usr.sbin/unbound/libunbound/libunbound.c
index b3a4c2ba77f..23d489e2ead 100644
--- a/usr.sbin/unbound/libunbound/libunbound.c
+++ b/usr.sbin/unbound/libunbound/libunbound.c
@@ -946,7 +946,7 @@ ub_ctx_resolvconf(struct ub_ctx* ctx, const char* fname)
while (ptr) {
numserv++;
if((retval=ub_ctx_set_fwd(ctx,
- ptr->IpAddress.String)!=0)) {
+ ptr->IpAddress.String))!=0) {
free(info);
return retval;
}