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

Fixed: [default state data returned with get-config](https://github.com/clicon/clixon/issues/140)

Browse source 
* Generalized default code for both config and state
This commit is contained in:
Olof hagsand 2020-09-27 17:14:28 +02:00
parent da54dae396
commit 9984cfa1c8
15 changed files with 344 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/src/clixon_datastore_read.c
View file

@ -568,10 +568,10 @@ xmldb_get_nocache(clicon_handle h,
if (yb != YB_NONE){
/* Add global defaults. */
if (xml_global_defaults(h, xt, nsc, xpath, yspec) < 0)
if (xml_global_defaults(h, xt, nsc, xpath, yspec, 0) < 0)
goto done;
/* Add default values (if not set) */
if (xml_default_recurse(xt) < 0)
if (xml_default_recurse(xt, 0) < 0)
goto done;
}
/* If empty NACM config, then disable NACM if loaded
@ -715,10 +715,10 @@ xmldb_get_cache(clicon_handle h,
goto done;
if (yb != YB_NONE){
/* Add default global values */
if (xml_global_defaults(h, x1t, nsc, xpath, yspec) < 0)
if (xml_global_defaults(h, x1t, nsc, xpath, yspec, 0) < 0)
goto done;
/* Add default recursive values */
if (xml_default_recurse(x1t) < 0)
if (xml_default_recurse(x1t, 0) < 0)
goto done;
}
/* If empty NACM config, then disable NACM if loaded
@ -812,10 +812,10 @@ xmldb_get_zerocopy(clicon_handle h,
}
if (yb != YB_NONE){
/* Add global defaults. */
if (xml_global_defaults(h, x0t, nsc, xpath, yspec) < 0)
if (xml_global_defaults(h, x0t, nsc, xpath, yspec, 0) < 0)
goto done;
/* Apply default values (removed in clear function) */
if (xml_default_recurse(x0t) < 0)
if (xml_default_recurse(x0t, 0) < 0)
goto done;
}
/* If empty NACM config, then disable NACM if loaded