summaryrefslogtreecommitdiff
path: root/src/cli_new.c
diff options
context:
space:
mode:
authorMichael Larson <mike@vyatta.com>2011-01-06 13:56:56 -0800
committerMichael Larson <mike@vyatta.com>2011-01-06 13:56:56 -0800
commitc13f949c55df81052c73d394d5ed5ea18a65502b (patch)
tree1fceaf271a3b1bfb25feafdc8f8e198ee61a3c39 /src/cli_new.c
parent73f94b1330dd2002d7f4f49818cbfe9e1131def0 (diff)
downloadvyatta-cfg-c13f949c55df81052c73d394d5ed5ea18a65502b.tar.gz
vyatta-cfg-c13f949c55df81052c73d394d5ed5ea18a65502b.zip
re-enable concurrent configuration commit locking.
locking can be overrode though commit -l flag.
Diffstat (limited to 'src/cli_new.c')
-rw-r--r--src/cli_new.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cli_new.c b/src/cli_new.c
index 87f8e8b..2db7996 100644
--- a/src/cli_new.c
+++ b/src/cli_new.c
@@ -461,7 +461,10 @@ get_config_lock()
} else if (fd != -1) {
close(fd);
}
- release_config_lock();
+ //code below will cause a concurrent commit to release lock on failure, and
+ //therefore, allow the concurrent to proceed the second time.
+ //lock can be forced via commit flag instead.
+ // release_config_lock();
}
return ret;
}