Merge branch 'collectd-4.4' into collectd-4.5

[collectd.git] / src / configfile.c

diff --git a/src/configfile.c b/src/configfile.c
index d483032af71b398d10a44c808c65285e55e805e8..9609086feca391d0e6c097c03eeef3e7207a5b74 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -887,7 +887,11 @@ int cf_read (char *filename)
                        dispatch_block (conf->children + i);
        }
 
+       oconfig_free (conf);
+
+       /* Read the default types.db if no `TypesDB' option was given. */
        if (cf_default_typesdb)
-               read_types_list (PLUGINDIR"/types.db"); /* FIXME: Configure path */
+               read_types_list (PLUGINDIR"/types.db");
+
        return (0);
 } /* int cf_read */