summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Židek <mzidek@redhat.com>2015-10-22 12:51:47 +0200
committerJakub Hrozek <jhrozek@redhat.com>2015-10-23 10:33:06 +0200
commite563de9203be581acc30c7794f568ae40d22bee0 (patch)
tree99d5b723ff7ba6f706621dc1165cd950dbf35ab2
parent2bbc9d6f8d5f2c1b07fd6968314b7f530b7f3a4d (diff)
downloadsssd-e563de9203be581acc30c7794f568ae40d22bee0.tar.gz
sssd-e563de9203be581acc30c7794f568ae40d22bee0.tar.xz
sssd-e563de9203be581acc30c7794f568ae40d22bee0.zip
Refactor some conditions
Conditions with get_next_domain were a little confusing for coverity (but also for developers' eyes). Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-rw-r--r--src/responder/autofs/autofssrv_cmd.c4
-rw-r--r--src/responder/nss/nsssrv_netgroup.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/responder/autofs/autofssrv_cmd.c b/src/responder/autofs/autofssrv_cmd.c
index 82f2f8647..42754aceb 100644
--- a/src/responder/autofs/autofssrv_cmd.c
+++ b/src/responder/autofs/autofssrv_cmd.c
@@ -868,8 +868,8 @@ static void lookup_automntmap_cache_updated(uint16_t err_maj, uint32_t err_min,
"Will try to return what we have in cache\n",
(unsigned int)err_maj, (unsigned int)err_min, err_msg);
/* Loop to the next domain if possible */
- if (dctx->cmd_ctx->check_next && get_next_domain(dctx->domain, 0)) {
- dctx->domain = get_next_domain(dctx->domain, 0);
+ if (dctx->cmd_ctx->check_next
+ && (dctx->domain = get_next_domain(dctx->domain, 0))) {
dctx->check_provider = NEED_CHECK_PROVIDER(dctx->domain->provider);
}
}
diff --git a/src/responder/nss/nsssrv_netgroup.c b/src/responder/nss/nsssrv_netgroup.c
index bee4552d5..9a78c1119 100644
--- a/src/responder/nss/nsssrv_netgroup.c
+++ b/src/responder/nss/nsssrv_netgroup.c
@@ -646,8 +646,8 @@ static void lookup_netgr_dp_callback(uint16_t err_maj, uint32_t err_min,
"Will try to return what we have in cache\n",
(unsigned int)err_maj, (unsigned int)err_min, err_msg);
/* Loop to the next domain if possible */
- if (cmdctx->check_next && get_next_domain(dctx->domain, 0)) {
- dctx->domain = get_next_domain(dctx->domain, 0);
+ if (cmdctx->check_next
+ && (dctx->domain = get_next_domain(dctx->domain, 0))) {
dctx->check_provider = NEED_CHECK_PROVIDER(dctx->domain->provider);
}
}