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

Fixed: [cl:creator attribute must be persistent](https://github.com/clicon/clixon-controller/issues/54)

Browse source
This commit is contained in:
Olof hagsand 2023-11-03 14:06:41 +01:00
parent c703e89bc8
commit 2f88ef3ed6
5 changed files with 97 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/src/clixon_datastore_write.c
View file

@ -798,8 +798,12 @@ text_modify(clicon_handle h,
}
/* XXX: Note, if there is an error in adding the object later, the
* original object is not reverted.
* XXX: Here creator attributes in x0 are destroyed
*/
if (x0){
/* Recursively copy creator attributes from existing tree */
if (xml_creator_copy_all(x0, x1) < 0)
goto done;
xml_purge(x0);
x0 = NULL;
}
@ -849,7 +853,7 @@ text_modify(clicon_handle h,
#ifdef XML_PARENT_CANDIDATE
xml_parent_candidate_set(x0, x0p);
#endif
if (xml_creator_copy(x1, x0) < 0)
if (xml_creator_copy_one(x1, x0) < 0)
goto done;
changed++;
/* Get namespace from x1
@ -1257,12 +1261,10 @@ xmldb_put(clicon_handle h,
goto done;
}
/* Here x0 looks like: <config>...</config> */
#if 0 /* debug */
if (xml_apply0(x1, -1, xml_sort_verify, NULL) < 0)
clicon_log(LOG_NOTICE, "%s: verify failed #1", __FUNCTION__);
#endif
xnacm = clicon_nacm_cache(h);
permit = (xnacm==NULL);