mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2026-02-09 05:20:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

B#13546: BBF DotSo & JSON plugin overrides entire tree

Browse source
This commit is contained in:
Amin Ben Romdhane 2024-02-05 16:48:34 +01:00
parent 24350050f9
commit 223c3e613d
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libbbfdm-api/plugin/dotso_plugin.c
View file

@ -72,9 +72,6 @@ int load_dotso_plugins(DMOBJ *entryobj, const char *plugin_path)
if (dynamic_obj[i].root_obj) {
// Disable object if it already exists in the main tree
disable_entry_obj(dm_entryobj, dynamic_obj[i].root_obj->obj);
if (dm_entryobj->nextdynamicobj == NULL) {
dm_entryobj->nextdynamicobj = calloc(__INDX_DYNAMIC_MAX, sizeof(struct dm_dynamic_obj));
dm_entryobj->nextdynamicobj[INDX_JSON_MOUNT].idx_type = INDX_JSON_MOUNT;

5
libbbfdm-api/plugin/json_plugin.c
View file

@ -1881,11 +1881,9 @@ int load_json_plugins(DMOBJ *entryobj, const char *plugin_path)
}
char obj_prefix[MAX_DM_LENGTH] = {0};
char obj_name[64] = {0};
char *obj_path = replace_str(key, "{BBF_VENDOR_PREFIX}", BBF_VENDOR_PREFIX);
find_prefix_obj(obj_path, obj_prefix, MAX_DM_LENGTH);
find_current_obj(obj_path, obj_name, sizeof(obj_name));
DMOBJ *dm_entryobj = find_entry_obj(entryobj, obj_prefix);
if (!dm_entryobj) {
@ -1893,9 +1891,6 @@ int load_json_plugins(DMOBJ *entryobj, const char *plugin_path)
continue;
}
// Disable object if it already exists in the main tree
disable_entry_obj(dm_entryobj, obj_name);
if (dm_entryobj->nextdynamicobj == NULL) {
dm_entryobj->nextdynamicobj = calloc(__INDX_DYNAMIC_MAX, sizeof(struct dm_dynamic_obj));
dm_entryobj->nextdynamicobj[INDX_JSON_MOUNT].idx_type = INDX_JSON_MOUNT;