Merge branch 'collectd-4.4'

Conflicts:

	src/collectd-perl.pod
	src/email.c

diff --cc src/collectd-perl.pod
index 5a58d357dd8ff5e7e1f5bc7988f66becfd4bea16,8cdf08bb3b6807229bb4a985a5b01f74771f8378..b7ae9cace9c89f636172c1d27e5ccc5fbd4b3c9c
--- 1/src/collectd-perl.pod
--- 2/src/collectd-perl.pod
+++ b/src/collectd-perl.pod
@@@ -281,11 -292,22 +294,27 @@@ is found (and the number of values matc
  type, data-set and value-list is passed to all write-callbacks that are
  registered with the daemon.
  
 +B<Note>: Prior to version 4.4 of collectd, the data-set type used to be passed
 +as the first argument to B<plugin_register>. This syntax is still supported
 +for backwards compatibility but has been deprecated and will be removed in
 +some future version of collectd.
 +
+ =item B<plugin_flush> ([B<timeout> => I<timeout>,] [B<plugins> => I<...>])
+ 
+ Flush one or more plugins. I<timeout> is passed on to the registered
+ flush-callbacks. If omitted, C<-1> is used. If the I<plugins> argument has
+ been specified, only named plugins will be flushed. The argument's value may
+ either be a string or a reference to an array of strings.
+ 
+ =item B<plugin_flush_one> (I<timeout>, I<plugin>)
+ 
+ This is identical to using "plugin_flush (timeout =E<gt> I<timeout>, plugins
+ =E<gt> I<plugin>".
+ 
+ =item B<plugin_flush_all> (I<timeout>)
+ 
+ This is identical to using "plugin_flush (timeout =E<gt> I<timeout>)".
+ 
  =item B<plugin_dispatch_notification> (I<notification>)
  
  Submits a I<notification> to the daemon which will then pass it to all

diff --cc src/collectd.c
Simple merge

diff --cc src/email.c
index b255ac79ea1f2f9230a3cdd0330bf80753a736e7,87daed113273227cfd3f82601fea5421159e6b67..200b60c1851dd2ac352a91c43df93678a7f0142f
--- 1/src/email.c
--- 2/src/email.c
+++ b/src/email.c
@@@ -511,7 -394,8 +394,7 @@@ static void *open_connection (void *arg
  
        addr.sun_family = AF_UNIX;
  
-       sstrncpy (addr.sun_path, sock_file, sizeof (addr.sun_path));
 -      strncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
 -      addr.sun_path[UNIX_PATH_MAX - 1] = '\0';
++      sstrncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
        unlink (addr.sun_path);
  
        errno = 0;

diff --cc src/interface.c
Simple merge

diff --cc src/load.c
Simple merge

diff --cc src/memory.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/swap.c
Simple merge