X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2FSpamAssassin%2FCollectd.pm;h=b53cf953fcf201f7fb21c98bf830afda70e8908b;hb=96b920e6b7bf70560eb95c911202afbeaab2b965;hp=c76c44da593994dbb42ffc28450474b302106bf0;hpb=f179018be96e1e1aea25d4928bdaf100a9a92a7d;p=collectd.git

diff --git a/contrib/SpamAssassin/Collectd.pm b/contrib/SpamAssassin/Collectd.pm
index c76c44da..b53cf953 100644
--- a/contrib/SpamAssassin/Collectd.pm
+++ b/contrib/SpamAssassin/Collectd.pm
@@ -18,7 +18,7 @@ add a loadplugin call into your init.pre file.
 
 =over 4
 
-=item collectd_socket [ socket path ]	    (default: /tmp/.collectd-email)
+=item collectd_socket [ socket path ]	    (default: /var/run/collectd-email)
 
 Where the collectd socket is
 
@@ -116,7 +116,7 @@ sub set_config {
 
     push (@cmds, {
 	    setting => 'collectd_socket', 
-	    default => '/tmp/.collectd-email',
+	    default => '/var/run/collectd-email',
 	    type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
     });
 
@@ -152,8 +152,8 @@ sub check_end {
 		#try at least $self->{main}->{conf}->{collectd_retries} to get a
 		#connection
 		for (my $i = 0; $i < $self->{main}->{conf}->{collectd_retries} ; ++$i) {
-			last if $sock = new IO::Socket::UNIX
-				($self->{main}->{conf}->{collectd_socket});
+		        my ($socket_path) = $self->{main}->{conf}->{collectd_socket} =~ /(.*)/; # Untaint path, which can contain any characters.
+			last if $sock = new IO::Socket::UNIX $socket_path;
 			#sleep a random value between 0 and 50 microsecs to try for a new
 			#thread
 			usleep(int(rand(50)));