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

startup diff vector should be children of config root, not root itself

Browse source
This commit is contained in:
Olof Hagsand 2019-03-29 15:31:00 +01:00
parent 38991084a5
commit c07577b42b
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/backend/backend_commit.c
View file

@ -172,6 +172,7 @@ startup_common(clicon_handle h,
int ret; int ret;
modstate_diff_t *msd = NULL; modstate_diff_t *msd = NULL;
cxobj *xt = NULL; cxobj *xt = NULL;
cxobj *x;
/* If CLICON_XMLDB_MODSTATE is enabled, then get the db XML with /* If CLICON_XMLDB_MODSTATE is enabled, then get the db XML with
* potentially non-matching module-state in msd * potentially non-matching module-state in msd
@ -198,8 +199,11 @@ startup_common(clicon_handle h,
goto done; goto done;
/* Handcraft transition with with only add tree */ /* Handcraft transition with with only add tree */
td->td_target = xt; td->td_target = xt;
if (cxvec_append(td->td_target, &td->td_avec, &td->td_alen) < 0) x = NULL;
while ((x = xml_child_each(td->td_target, x, CX_ELMNT)) != NULL){
if (cxvec_append(x, &td->td_avec, &td->td_alen) < 0)
goto done; goto done;
}
/* 4. Call plugin transaction start callbacks */ /* 4. Call plugin transaction start callbacks */
if (plugin_transaction_begin(h, td) < 0) if (plugin_transaction_begin(h, td) < 0)