Skip to content

Commit 7054c01

Browse files
committed
Issue 631: Private candidate datastores are not deleted
1 parent 12656f2 commit 7054c01

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

apps/backend/backend_confirm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ cancel_confirmed_commit(clixon_handle h)
392392

393393
confirmed_commit_state_set(h, INACTIVE);
394394

395-
if (xmldb_delete(h, "rollback") < 0)
395+
if (xmldb_delete(h, "rollback", 0) < 0)
396396
clixon_err(OE_DB, 0, "Error deleting the rollback configuration");
397397
return 0;
398398
}
@@ -604,7 +604,7 @@ handle_confirmed_commit(clixon_handle h,
604604
/* There was no subsequent confirmed-commit, meaning this is the end of the confirmed/confirming sequence;
605605
* The new configuration is already committed to running and the rollback database can now be deleted
606606
*/
607-
if (xmldb_delete(h, "rollback") < 0) {
607+
if (xmldb_delete(h, "rollback", 0) < 0) {
608608
clixon_err(OE_DB, 0, "Error deleting the rollback configuration");
609609
goto done;
610610
}
@@ -685,7 +685,7 @@ do_rollback(clixon_handle h,
685685
}
686686
cbuf_free(cbret);
687687

688-
if (xmldb_delete(h, "rollback") < 0) {
688+
if (xmldb_delete(h, "rollback", 0) < 0) {
689689
clixon_log(h, LOG_WARNING, "A rollback occurred but the rollback_db wasn't deleted.");
690690
errstate |= ROLLBACK_DB_NOT_DELETED;
691691
goto done;

apps/backend/backend_startup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ startup_mode_startup(clixon_handle h,
175175
goto ok;
176176
case 1:
177177
/* validation ok */
178-
xmldb_delete(h, "rollback");
178+
xmldb_delete(h, "rollback", 0);
179179
goto ok;
180180
default:
181181
/* Unexpected response */
@@ -346,7 +346,7 @@ startup_extraxml(clixon_handle h,
346346
xml_free(xt);
347347
if (xt0)
348348
xml_free(xt0);
349-
if (xmldb_delete(h, tmp_db) != 0 && errno != ENOENT)
349+
if (xmldb_delete(h, tmp_db, 0) != 0 && errno != ENOENT)
350350
return -1;
351351
return retval;
352352
fail:

0 commit comments

Comments
 (0)