Merge branch 'collectd-4.4'

diff --combined contrib/cussh.pl
index 48f5e93,3fa4105..23a9078
--- 1/contrib/cussh.pl
--- 2/contrib/cussh.pl
+++ b/contrib/cussh.pl
@@@ -113,7 -113,7 +113,7 @@@ sub getid 
  
        print $$string . $/;
        my ($h, $p, $pi, $t, $ti) =
-               $$string =~ m/^(\w+)\/(\w+)(?:-(\w+))?\/(\w+)(?:-(\w+))?\s*/;
+               $$string =~ m#^([^/]+)/([^/-]+)(?:-([^/]+))?/([^/-]+)(?:-([^/]+))?\s*#;
        $$string = $';
  
        return if ((! $h) || (! $p) || (! $t));
@@@ -122,8 -122,8 +122,8 @@@
  
        ($id{'host'}, $id{'plugin'}, $id{'type'}) = ($h, $p, $t);
  
-       $id{'plugin_instance'} = $pi if ($pi);
-       $id{'type_instance'} = $ti if ($ti);
+       $id{'plugin_instance'} = $pi if defined ($pi);
+       $id{'type_instance'} = $ti if defined ($ti);
        return \%id;
  }
  
@@@ -223,15 -223,6 +223,15 @@@ sub flush 
                        elsif ($option eq "timeout") {
                                $args{"timeout"} = $value;
                        }
 +                      elsif ($option eq "identifier") {
 +                              my $id = getid (\$value);
 +                              if (!$id)
 +                              {
 +                                      print STDERR "Not a valid identifier: \"$value\"\n";
 +                                      next;
 +                              }
 +                              push @{$args{"identifier"}}, $id;
 +                      }
                        else {
                                print STDERR "Invalid option \"$option\".\n";
                                return;