* added strict and warnings to the cgi and the daemon wrappers ...

* fixed regression introduced while fixing taint issues

7 files changed, 26 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index 5366a3f..42083ee 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,13 @@
+2008/7/24 -- released version 2.4.2
+
+* added strict to both wrappers and fixed some followup errors -- tobi
+
 * kill taint error in Smokeping.pm -- tobi
 
 * better master/slave secrets documentation -- tobi
 
 * do not load :sys_wait_h from POSIX perl module since this seems to
-  be missing in some linux distros and we can do alright without I think.
+  be missing in some linux distros and we can do alright without.
 
 2008/6/13 -- released version 2.4.1
 
diff --git a/Makefile b/Makefile
index d471179..2685b17 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 SHELL = /bin/sh
-VERSION := 2.4.1
+VERSION := 2.4.2
 SVNREPO = svn://svn.oetiker.ch/smokeping
 ############ A is for features
 ############ B is for bugfixes
 ############ V.AAABBB
 ############ 2.000001
 ############ 2.000002
-NUMVERSION = 2.004000
+NUMVERSION = 2.004002
 IGNORE = ~|CVS|var/|smokeping-$(VERSION)/smokeping-$(VERSION)|cvsignore|rej|orig|DEAD|pod2htm[di]\.tmp|\.svn|tar\.gz|DEADJOE|svn-commit\.tmp
 GROFF = groff
 PERL = perl-5.8.8
diff --git a/bin/smokeping.dist b/bin/smokeping.dist
index 148a880..711580b 100755
--- a/bin/smokeping.dist
+++ b/bin/smokeping.dist
@@ -1,9 +1,10 @@
-#!/usr/sepp/bin/perl-5.8.4 -w
+#!/usr/bin/perl -w
 # -*-perl-*-
 
-use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl);
+use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl);
 use lib qw(lib);
-
+use strict;
+use warnings;
 use Smokeping 2.004000;
  
 Smokeping::main("etc/config.dist");
diff --git a/bin/tSmoke.dist b/bin/tSmoke.dist
index cf876f8..d4612d2 100755
--- a/bin/tSmoke.dist
+++ b/bin/tSmoke.dist
@@ -43,6 +43,7 @@
 # Tobias Oetiker, or course, the author of Smokeping, RRDTool and MRTG
 #
 use strict;
+use warnings;
 
 # We need to use
 # -- Smokeping libraries
@@ -51,7 +52,7 @@ use strict;
 #
 # Point the lib variables to your implementation
 use lib qw(lib);
-use lib "/usr/local/rrdtool-1.0.39/lib/perl";
+use lib qw(/usr/local/rrdtool-1.0.39/lib/perl);
 
 use Smokeping 2.004000;
 use Net::SMTP;
diff --git a/etc/config.dist b/etc/config.dist
index c8758d0..f641cac 100644
--- a/etc/config.dist
+++ b/etc/config.dist
@@ -112,7 +112,10 @@ secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.d
 +boomer
 display_name=boomer
 color=0000ff
+
 +slave2
+display_name=another
+color=00ff00
 
 *** Targets ***
 
diff --git a/htdocs/smokeping.cgi.dist b/htdocs/smokeping.cgi.dist
index 6e462d8..fb62eba 100755
--- a/htdocs/smokeping.cgi.dist
+++ b/htdocs/smokeping.cgi.dist
@@ -1,13 +1,17 @@
-#!/usr/sepp/bin/speedy -w
+#!/usr/bin/speedy
 # -*-perl-*-
 
-use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
-use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
+use strict;
+use warnings;
+
+use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl);
+use lib qw(/home/oetiker/checkouts/smokeping/trunk/software/lib);
+
 use CGI::Carp qw(fatalsToBrowser);
 
 use Smokeping 2.004000;
 
-Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
+Smokeping::cgi("/home/oetiker/checkouts/smokeping/trunk/software/etc/config.dist");
 
 =head1 NAME
 
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index cb8ec46..2b680a7 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -1547,12 +1547,12 @@ sub hierarchy_switcher($$){
 sub display_webpage($$){
     my $cfg = shift;
     my $q = shift;
-    my $trag = '';
+    my $targ = '';
     if ( $q->param('target') and $q->param('target') !~ /\.\./ and $q->param('target') =~ /(\S+)/){
         $targ = $1;
     }
     my ($path,$slave) = split(/~/,$targ);
-    if ($slave and $slave ~= /(\S+)/){
+    if ($slave and $slave =~ /(\S+)/){
         die "ERROR: slave '$slave' is not defined in the '*** Slaves ***' section!\n"
             unless defined $cfg->{Slaves}{$slave};
         $slave = $1;