summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorslioch <slioch@eng-140.vyatta.com>2009-07-14 10:56:02 -0700
committerslioch <slioch@eng-140.vyatta.com>2009-07-14 10:56:02 -0700
commit16ac46a91fe4e4bde4d940d820ed047f219fea84 (patch)
tree09d6f702ce4d19778796c90fd744c8572930c330
parent3ba4d4ce7941d3cbcf7d6529300a5e47fe93c7e7 (diff)
downloadvyatta-cfg-16ac46a91fe4e4bde4d940d820ed047f219fea84.tar.gz
vyatta-cfg-16ac46a91fe4e4bde4d940d820ed047f219fea84.zip
fix for bug 4255. commit check was not being called on active node that had deleted children. This change only affects
the commit check for nodes that are transactions and are not directly deleted, but have deleted children. commit check is now being called.
-rw-r--r--src/commit2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commit2.c b/src/commit2.c
index 40cfebf..0e9d5ce 100644
--- a/src/commit2.c
+++ b/src/commit2.c
@@ -997,7 +997,7 @@ validate_func(GNode *node, gpointer data)
}
}
- if (IS_DELETE(d->_operation)) {
+ if (IS_DELETE(d->_operation) && !IS_ACTIVE(d->_operation)) {
return FALSE; //will not perform validation checks on deleted nodes
}