Merge branch 'sh/next'

[collectd.git] / src / configfile.c

diff --git a/src/configfile.c b/src/configfile.c
index 9609086..f9c20fc 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -276,7 +276,7 @@ static int dispatch_value_plugin (const char *plugin, oconfig_item_t *ci)
        buffer_ptr = buffer + 1;
 
        return (cf_dispatch (plugin, ci->key, buffer_ptr));
-} /* int plugin_conf_dispatch */
+} /* int dispatch_value_plugin */
 
 static int dispatch_value (const oconfig_item_t *ci)
 {
@@ -891,7 +891,7 @@ int cf_read (char *filename)
 
        /* Read the default types.db if no `TypesDB' option was given. */
        if (cf_default_typesdb)
-               read_types_list (PLUGINDIR"/types.db");
+               read_types_list (PKGDATADIR"/types.db");
 
        return (0);
 } /* int cf_read */