From 83d4d1a7847789ab801f04a6132e81c3d2ddc662 Mon Sep 17 00:00:00 2001 From: Tobin Harding Date: Fri, 6 Oct 2017 13:38:55 +1100 Subject: [PATCH] Use bitwise '&' instead of logical '&&' Make two instances of the same change. Change bitwise AND (&) to logical AND (&&). Currently the code uses a bitwise AND between two boolean values. In the first instance; The first operand is a flag that has been bitwise combined with a bit mask to get a boolean value as to whether a file has group write permissions set. The second operand used is a struct member that is intended as a boolean flag not a bit mask. In the second instance the argument is the same except with world write permissions instead of group write (S_IWOTH, S_IWGRP). Reviewed-by: Brian Behlendorf Reviewed-by: George Melikov Reviewed-by: Chris Dunlop Signed-off-by: Tobin C. Harding Closes #6684 Closes #6722 --- cmd/zed/zed_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/zed/zed_conf.c b/cmd/zed/zed_conf.c index a79fe862d..5b27f1e4f 100644 --- a/cmd/zed/zed_conf.c +++ b/cmd/zed/zed_conf.c @@ -394,13 +394,13 @@ zed_conf_scan_dir(struct zed_conf *zcp) direntp->d_name); continue; } - if ((st.st_mode & S_IWGRP) & !zcp->do_force) { + if ((st.st_mode & S_IWGRP) && !zcp->do_force) { zed_log_msg(LOG_NOTICE, "Ignoring \"%s\": writable by group", direntp->d_name); continue; } - if ((st.st_mode & S_IWOTH) & !zcp->do_force) { + if ((st.st_mode & S_IWOTH) && !zcp->do_force) { zed_log_msg(LOG_NOTICE, "Ignoring \"%s\": writable by other", direntp->d_name); -- 2.40.0