]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Firewall: Remarkcheck should now support old firewallrules from converter
authorAlexander Marx <alexander.marx@ipfire.org>
Wed, 5 Mar 2014 07:13:04 +0000 (08:13 +0100)
committerAlexander Marx <alexander.marx@ipfire.org>
Wed, 5 Mar 2014 07:13:04 +0000 (08:13 +0100)
html/cgi-bin/firewall.cgi

index d9f9e0f8a8ffeb533477edb5bfa69c0fe2204934..e633b3c5c291c713ad851231c2305d297a8d2c33 100644 (file)
@@ -2141,6 +2141,7 @@ sub saverule
                        &changerule($configfwdfw);
                        #print"6";
                }
+               $fwdfwsettings{'ruleremark'}=~ s/,/;/g;
                $fwdfwsettings{'ruleremark'}=&Header::escape($fwdfwsettings{'ruleremark'});
                if ($fwdfwsettings{'updatefwrule'} ne 'on'){
                        my $key = &General::findhasharraykey ($hash);
@@ -2278,7 +2279,6 @@ sub validremark
 {
        # Checks a hostname against RFC1035
        my $remark = $_[0];
-       $remark =~ s/,/;/g;
        if ($remark =~ /^[[:print:]]*$/) {
                return 1;
        }