diff options
| author | Tobin Harding <[email protected]> | 2017-10-06 13:38:55 +1100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-10-05 19:38:55 -0700 |
| commit | a0430cc5a913406cf471bcafac31c5118d89843f (patch) | |
| tree | 9fe280c288a59320b21e87d83895bf109933d1d7 /cmd/zed/zed_conf.c | |
| parent | d95a59805f8f00046bb449fb12161e1f0caf65fb (diff) | |
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 <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Chris Dunlop <[email protected]>
Signed-off-by: Tobin C. Harding <[email protected]>
Closes #6684
Closes #6722
Diffstat (limited to 'cmd/zed/zed_conf.c')
| -rw-r--r-- | cmd/zed/zed_conf.c | 4 |
1 files 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); |