General-Fuctions gefixt, da der DHCP-Client die Strings mit einigen Leerstellen davor speichert.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@481 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-04-04 17:27:58 +00:00
parent bf7c473f7b
commit 77007ce502
4 changed files with 68 additions and 4 deletions

View File

@@ -37,7 +37,7 @@ sub log
my $logmessage = $_[0];
$logmessage =~ /([\w\W]*)/;
$logmessage = $1;
system('/usr/bin/logger', '-t', $tag, $logmessage);
system('logger', '-t', $tag, $logmessage);
}
sub readhash
@@ -63,8 +63,13 @@ sub readhash
$val =~ s/\'$//g;
# Untaint variables read from hash
$var =~ /([A-Za-z0-9_-]*)/; $var = $1;
$val =~ /([\w\W]*)/; $val = $1;
# trim space from begin and end
$var =~ s/^\s+//;
$var =~ s/\s+$//;
$var =~ /([A-Za-z0-9_-]*)/;
$var = $1;
$val =~ /([\w\W]*)/;
$val = $1;
$hash->{$var} = $val;
}
}

View File

@@ -69,6 +69,7 @@ usr/local/bin/settime
usr/local/bin/timecheck
usr/local/bin/tunerrd.pl
usr/local/bin/vpn-restart
usr/local/bin/vpn-watch
#usr/local/include
#usr/local/lib
#usr/local/sbin