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

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@481 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 57939d8bd8b16594b567e0537b2f34d735caf271..4365de5ded603b1c77d9aaf6318d9fdc31586a02 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -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;
                }
        }

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 08b5462e4c3c475e5ce7964dfbddee18e2f92d02..7fd6ee2cc9fdaa8103c0f4cae0db2395bd7cb7f3 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -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

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 517748acd9fbe82fb07ce0da6325400a0e0ec397..7434c24c28c5603ba0063ef37a44ebc1fc35deed 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,61 @@
+------------------------------------------------------------------------
+r480 | ms | 2007-04-04 14:55:38 +0200 (Wed, 04 Apr 2007) | 3 lines
+
+Netzwerkscripts erweitert.
+Sprachsdateien aktualisiert, Menue fuer Firewallloggraphen hinzugefuegt.
+
+------------------------------------------------------------------------
+r479 | maniacikarus | 2007-04-03 22:53:31 +0200 (Tue, 03 Apr 2007) | 4 lines
+
+Samba CGI 2sprachig DE und ENG
+Anpassung an der Samba Controll Datei
+Tango Icons hinzugefügt
+
+------------------------------------------------------------------------
+r478 | ms | 2007-04-03 21:55:47 +0200 (Tue, 03 Apr 2007) | 2 lines
+
+BWM-NG hinzugefuegt
+
+------------------------------------------------------------------------
+r477 | ms | 2007-04-03 20:58:19 +0200 (Tue, 03 Apr 2007) | 2 lines
+
+Die letzten Quellcodepakete vom IPCop hinzugefuegt.
+
+------------------------------------------------------------------------
+r476 | ms | 2007-04-03 20:52:26 +0200 (Tue, 03 Apr 2007) | 3 lines
+
+Tag von SVN295 erstellt, da das die letzte funktionierende Version mit
+Kernel 2.4 ist.
+
+------------------------------------------------------------------------
+r475 | ms | 2007-04-03 20:41:59 +0200 (Tue, 03 Apr 2007) | 3 lines
+
+Farbiger Bash-Prompt.
+PPPoE-Script zur Einwahl.
+
+------------------------------------------------------------------------
+r474 | maniacikarus | 2007-03-31 15:26:25 +0200 (Sat, 31 Mar 2007) | 4 lines
+
+Samba Status und Logauswertung fertiggestelllt
+ausserdem eine Menge Codefixes
+einige Icons eingefügt
+
+------------------------------------------------------------------------
+r473 | ms | 2007-03-29 22:10:53 +0200 (Thu, 29 Mar 2007) | 2 lines
+
+Netzwerkbeta-Bugfixes...
+
+------------------------------------------------------------------------
+r472 | maniacikarus | 2007-03-29 21:50:28 +0200 (Thu, 29 Mar 2007) | 3 lines
+
+Upnp fast fertig gestellt zumindest was Web
+und Ctrl Datei angeht
+
+------------------------------------------------------------------------
+r471 | ms | 2007-03-29 20:18:27 +0200 (Thu, 29 Mar 2007) | 2 lines
+
+Neue Netzwerkerkennung-Beta
+
 ------------------------------------------------------------------------
 r470 | ms | 2007-03-28 20:59:56 +0200 (Wed, 28 Mar 2007) | 2 lines
 

diff --git a/src/initscripts/init.d/net/red/pppoe b/src/initscripts/init.d/net/red/pppoe
index 431c2c0e76942c1042b347184fade7f0bb0a23e9..e369501baf5808ebbbb1a772cf27225d7332c5ec 100644 (file)
--- a/src/initscripts/init.d/net/red/pppoe
+++ b/src/initscripts/init.d/net/red/pppoe
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ########################################################################
 # Begin $network_devices/services/pppoe
 #