summaryrefslogtreecommitdiff
path: root/lib/ldb/tools/ldbedit.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-04 12:51:00 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-04-10 16:40:05 +1000
commit57341c0f29911d09e511c840386a35290febb9f9 (patch)
treebf123480733183f26f4b5970c42e16dfd559339d /lib/ldb/tools/ldbedit.c
parentd425a4cd3dded853aaefbca8873c95845933d383 (diff)
downloadsamba-57341c0f29911d09e511c840386a35290febb9f9.tar.gz
samba-57341c0f29911d09e511c840386a35290febb9f9.tar.bz2
samba-57341c0f29911d09e511c840386a35290febb9f9.zip
Revert "ldb: Permit desactivation of autocomit for every ldb_xxx_ctrl function"
This reverts commit 40a4aea8918c2637703af03383f440d068820e48. Autocommit is important, as otherwise an ldb module could error out during an operation, and leave an corrupt database. Andrew Bartlett
Diffstat (limited to 'lib/ldb/tools/ldbedit.c')
-rw-r--r--lib/ldb/tools/ldbedit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ldb/tools/ldbedit.c b/lib/ldb/tools/ldbedit.c
index 0a88efa766..cf4ab3f8ec 100644
--- a/lib/ldb/tools/ldbedit.c
+++ b/lib/ldb/tools/ldbedit.c
@@ -81,7 +81,7 @@ static int modify_record(struct ldb_context *ldb,
ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_MODIFY, mod);
}
- if (ldb_modify_ctrl(ldb, mod, req_ctrls, true) != LDB_SUCCESS) {
+ if (ldb_modify_ctrl(ldb, mod, req_ctrls) != LDB_SUCCESS) {
fprintf(stderr, "failed to modify %s - %s\n",
ldb_dn_get_linearized(msg1->dn), ldb_errstring(ldb));
ret = -1;
@@ -139,7 +139,7 @@ static int merge_edits(struct ldb_context *ldb,
if (options->verbose > 0) {
ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_ADD, msgs2[i]);
}
- if (ldb_add_ctrl(ldb, msgs2[i], req_ctrls, true) != LDB_SUCCESS) {
+ if (ldb_add_ctrl(ldb, msgs2[i], req_ctrls) != LDB_SUCCESS) {
fprintf(stderr, "failed to add %s - %s\n",
ldb_dn_get_linearized(msgs2[i]->dn),
ldb_errstring(ldb));
@@ -165,7 +165,7 @@ static int merge_edits(struct ldb_context *ldb,
if (options->verbose > 0) {
ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_DELETE, msgs1[i]);
}
- if (ldb_delete_ctrl(ldb, msgs1[i]->dn, req_ctrls, true) != LDB_SUCCESS) {
+ if (ldb_delete_ctrl(ldb, msgs1[i]->dn, req_ctrls) != LDB_SUCCESS) {
fprintf(stderr, "failed to delete %s - %s\n",
ldb_dn_get_linearized(msgs1[i]->dn),
ldb_errstring(ldb));