experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Non-key list now not accepted in edit-config (before only on validation)

Browse source
This commit is contained in:
Olof hagsand 2019-05-08 12:51:10 +02:00
parent 4e23864acd
commit 06e6ef80d1
25 changed files with 620 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/backend/backend_startup.c
View file

@ -262,11 +262,6 @@ startup_extraxml(clicon_handle h,
goto fail;
if (xt==NULL || xml_child_nr(xt)==0)
goto ok;
/* Write (potentially modified) xml tree xt back to tmp
*/
if ((ret = xmldb_put(h, "tmp", OP_REPLACE, xt,
clicon_username_get(h), cbret)) < 0)
goto done;
/* Merge tmp into running (no commit) */
if ((ret = db_merge(h, db, "running", cbret)) < 0)
goto fail;
@ -275,9 +270,9 @@ startup_extraxml(clicon_handle h,
ok:
retval = 1;
done:
if (xt)
if (xt && !clicon_option_bool(h, "CLICON_XMLDB_CACHE"))
xml_free(xt);
if (xmldb_delete(h, "tmp") != 0 && errno != ENOENT)
if (xmldb_delete(h, db) != 0 && errno != ENOENT)
return -1;
return retval;
fail: