diff options
author | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-10 13:50:30 -0700 |
---|---|---|
committer | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-10 13:50:30 -0700 |
commit | f69ea25a7f1fd307f4251c5b856339803ef117a4 (patch) | |
tree | d1201ca87f1192534f5d9abe942b1b942cc56ff4 /src | |
parent | 912b22df1dec1cf6f98bdff7c50887f45c90ad5e (diff) | |
download | vyatta-cfg-f69ea25a7f1fd307f4251c5b856339803ef117a4.tar.gz vyatta-cfg-f69ea25a7f1fd307f4251c5b856339803ef117a4.zip |
fix for bug 5679.
Diffstat (limited to 'src')
-rw-r--r-- | src/commit2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commit2.c b/src/commit2.c index fabc7ae..45a1a11 100644 --- a/src/commit2.c +++ b/src/commit2.c @@ -1264,7 +1264,7 @@ validate_func(GNode *node, gpointer data) } //don't perform validation checks on disabled nodes - if (d->_disable_op == K_LOCAL_DISABLE_OP) { + if ((d->_disable_op == K_LOCAL_DISABLE_OP) || (d->_disable_op == (K_LOCAL_DISABLE_OP | K_ACTIVE_DISABLE_OP))) { return FALSE; //SHOULD only hit the case where the node is locally disabled or globally disabled and not in a transition to active state } |