summaryrefslogtreecommitdiff
path: root/src/commit2.c
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 11:00:12 -0700
commit82751643f22509c145d7dae31798913ffc4c7f41 (patch)
treeb6d5864ce896f002ff1c365d6d0da25d5fa06a11 /src/commit2.c
parent19a9c88300b64cfdc341626a502253d27c3981fb (diff)
downloadvyatta-cfg-82751643f22509c145d7dae31798913ffc4c7f41.tar.gz
vyatta-cfg-82751643f22509c145d7dae31798913ffc4c7f41.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.
Diffstat (limited to 'src/commit2.c')
-rw-r--r--src/commit2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commit2.c b/src/commit2.c
index a324bab..d489923 100644
--- a/src/commit2.c
+++ b/src/commit2.c
@@ -1008,7 +1008,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
}