projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3329 from efuss/fix-3311
[collectd.git]
/
contrib
/
SpamAssassin
/
Collectd.pm
diff --git
a/contrib/SpamAssassin/Collectd.pm
b/contrib/SpamAssassin/Collectd.pm
index
1edcfc6
..
b53cf95
100644
(file)
--- a/
contrib/SpamAssassin/Collectd.pm
+++ b/
contrib/SpamAssassin/Collectd.pm
@@
-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) {
#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)));
#sleep a random value between 0 and 50 microsecs to try for a new
#thread
usleep(int(rand(50)));