summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-29 10:43:20 -0200
committershennetsind <ind@henn.et>2013-11-29 10:43:20 -0200
commit61b02a2b161deb19be4de8e627ebe0f4ffd9a238 (patch)
treeaa650e6a04de4de0451a9a35f3aa75e0c1385edc
parenta8fbcf880b529ed40e4a66b8c32de769e1b42cc1 (diff)
downloadhercules-61b02a2b161deb19be4de8e627ebe0f4ffd9a238.tar.gz
hercules-61b02a2b161deb19be4de8e627ebe0f4ffd9a238.tar.bz2
hercules-61b02a2b161deb19be4de8e627ebe0f4ffd9a238.tar.xz
hercules-61b02a2b161deb19be4de8e627ebe0f4ffd9a238.zip
Follow up 3a269dca93c421141631b4c87b2f366b6c130a42
Extended to the fix to aggregated as well, as in val: [ y,x ]/{y,x}/(x,y,...) Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--src/common/conf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/conf.c b/src/common/conf.c
index a6329d70e..813069ac4 100644
--- a/src/common/conf.c
+++ b/src/common/conf.c
@@ -83,6 +83,9 @@ void config_setting_copy_aggregate(config_setting_t *parent, const config_settin
config_setting_t *newAgg;
int i, n;
+ if( config_setting_get_member(parent, config_setting_name(src)) != NULL )
+ return;
+
newAgg = config_setting_add(parent, config_setting_name(src), config_setting_type(src));
if (newAgg == NULL)