summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiko Tyni <ntyni@iki.fi>2006-10-26 14:03:35 +0200
committerNiko Tyni <ntyni@iki.fi>2006-10-26 14:03:35 +0200
commit6a6ad273bb1d9e53835c045ff09fa222bfd9c0a8 (patch)
treeb892e381a7e236c380cad6cda6fa46615c8f677a
parent7c6e090f868e6f750c24ca4da3d31c69a8bdd99d (diff)
downloadsmokeping-6a6ad273bb1d9e53835c045ff09fa222bfd9c0a8.tar.gz
smokeping-6a6ad273bb1d9e53835c045ff09fa222bfd9c0a8.tar.xz
* make the CGI not croak if a password file is not readable. -- niko
-rw-r--r--CHANGES1
-rw-r--r--lib/Smokeping/probes/passwordchecker.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 0fee429..1079525 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,4 @@
+* make the CGI not croak if a password file is not readable. -- niko
* don't die if syslogd is dead -- niko, reported by
Christoph Biedl <cbiedl *gmx.de> as Debian bug #395056
* add sourceaddress configurability to FPing probe (requires -S flag) -- Norman Rasmussen norman rasmussen.co.za
diff --git a/lib/Smokeping/probes/passwordchecker.pm b/lib/Smokeping/probes/passwordchecker.pm
index d1cc128..74b0bf7 100644
--- a/lib/Smokeping/probes/passwordchecker.pm
+++ b/lib/Smokeping/probes/passwordchecker.pm
@@ -97,7 +97,7 @@ sub probevars {
_example => '/some/place/secret',
_sub => sub {
my $val = shift;
- -r $val or return "ERROR: password file $val is not readable.";
+ -r $val or $ENV{SERVER_SOFTWARE} or return "ERROR: password file $val is not readable.";
return undef;
},
},