summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/config.c b/config.c
index 30764c9..3242f5f 100644
--- a/config.c
+++ b/config.c
@@ -855,8 +855,7 @@ void domainline(char *line)
}
}
/* Some sanity checks now that all the options are parsed */
- if ((de->action & force) &&
- ((de->action & action_mask) <= incremental)) {
+ if (force(de) && (action(de) <= incremental)) {
fprintf(stderr, Name ": force makes no sense with ignore or "
"incremental, removing.\n");
de->action &= action_mask;
@@ -867,7 +866,7 @@ void domainline(char *line)
free(de->spare_group);
de->spare_group = NULL;
}
- if ((de->action & action_mask) == partition) {
+ if (action(de) == partition) {
for (prev_path = NULL, path = de->paths; path; )
if ((strstr(path->path, "part") != NULL) ||
(path->path[strlen(path->path) - 1] == '*')) {