Commit 6d7b3d52 authored by Wayne Davison's avatar Wayne Davison

Rules read in from per-dir merge files need to have non-applicable

rules filtered out before the rule gets stored (not in a post-
filtering pass like the rules that are read-in prior to the run).
parent 591b908f
......@@ -133,6 +133,19 @@ static void add_rule(struct filter_list_struct *listp, const char *pat,
listp->debug_type);
}
/* This flag also indicates that we're reading a list that
* needs to be filtered now, not post-filtered later. */
if (xflags & XFLG_ANCHORED2ABS) {
uint32 mf = mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE);
if (am_sender) {
if (mf == MATCHFLG_RECEIVER_SIDE)
return;
} else {
if (mf == MATCHFLG_SENDER_SIDE)
return;
}
}
if (!(ret = new(struct filter_struct)))
out_of_memory("add_rule");
memset(ret, 0, sizeof ret[0]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment