Fix rule attribute comparison

Rules don't have unique identifiers, so all attributes are compared
by initializing the ID mask to ~0. This doesn't work however since
nl_object_identical verifies whether the ID attributes are actually
present before comparing the objects, which is never the case.

Work around by using the intersection of present attributes when
comparing two rule objects.

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/lib/object.c b/lib/object.c
index 46d8141442bf3dacc7345ec4d18e7f324376aa51..d881ac997e974f48ea0e3c666f1473d81363cd34 100644 (file)
--- a/lib/object.c
+++ b/lib/object.c
@@ -265,6 +265,8 @@ int nl_object_identical(struct nl_object *a, struct nl_object *b)
                return 0;
 
        req_attrs = ops->oo_id_attrs;
+       if (req_attrs == ~0)
+               req_attrs = a->ce_mask & b->ce_mask;
 
        /* Both objects must provide all required attributes to uniquely
         * identify an object */