Merge branch 'collectd-4.2'

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 447870d..aac2d91 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -36,6 +36,12 @@ Plugins are loaded in the order listed in this config file. It is a good idea
 to load any logging plugins first in order to catch messages from plugins
 during configuration.
 
+The configuration is read and processed in order, i.E<nbsp>e. from top to
+bottom. So the plugins are loaded in the order listed in this config file. It
+is a good idea to load any logging plugins first in order to catch messages
+from plugins during configuration. Also, the C<LoadPlugin> option B<must> occur
+B<before> the C<E<lt>Plugin ...E<gt>> block.
+
 =head1 GLOBAL OPTIONS
 
 =over 4

diff --git a/src/configfile.c b/src/configfile.c
index 53a1753..3baec99 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -128,7 +128,9 @@ static int cf_dispatch (const char *type, const char *orig_key,
 
        if ((cf_cb = cf_search (type)) == NULL)
        {
-               WARNING ("Plugin `%s' did not register a callback.", type);
+               WARNING ("Found a configuration for the `%s' plugin, but "
+                               "the plugin isn't loaded or didn't register "
+                               "a configuration callback.", type);
                return (-1);
        }
 

diff --git a/src/unixsock.c b/src/unixsock.c
index 43e29c2..c7e0c44 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -29,6 +29,7 @@
 #include <pthread.h>
 
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/un.h>
 
 #include <grp.h>
@@ -365,6 +366,8 @@ static int us_open_socket (void)
                return (-1);
        }
 
+       chmod (sa.sun_path, sock_perms);
+
        status = listen (sock_fd, 8);
        if (status != 0)
        {