From 210e5daeab5419191c35876128473e5b3e330ff7 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Thu, 25 Jun 2015 19:11:16 +0200 Subject: [PATCH] policy: do not recurse child matches --- client/ifup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/ifup.c b/client/ifup.c index bf6292ee4..e7ba7d9b3 100644 --- a/client/ifup.c +++ b/client/ifup.c @@ -95,8 +95,9 @@ __ni_ifup_generate_match(const char *name, ni_ifworker_t *w) ni_ifworker_t *child = w->children.data[i]; xml_node_t *cnode; - cnode = __ni_ifup_generate_match(NI_NANNY_IFPOLICY_MATCH_COND_CHILD, child); - xml_node_add_child(or ,cnode); + cnode = xml_node_new(NI_NANNY_IFPOLICY_MATCH_COND_CHILD, or); + if (!cnode || !__ni_ifup_generate_match_dev(cnode, child)) + goto error; } }