]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Forward Firewall: 0.9.9.4a - Bugfix typo in firewallscript, DMZ Link on startpage...
authorAlexander Marx <amarx@ipfire.org>
Wed, 17 Apr 2013 10:02:13 +0000 (12:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 9 Aug 2013 12:13:10 +0000 (14:13 +0200)
html/cgi-bin/forwardfw.cgi
html/cgi-bin/index.cgi
src/initscripts/init.d/firewall

index 7bd3fa52f6ddf2db7cf02c010140262fe67b37ae..ef9264cb1866f4443d0dfce02c671ce7fd832e27 100755 (executable)
@@ -77,7 +77,7 @@ my %aliases=();
 my %optionsfw=();
 my %ifaces=();
 
 my %optionsfw=();
 my %ifaces=();
 
-my $VERSION='0.9.9.4';
+my $VERSION='0.9.9.4a';
 my $color;
 my $confignet          = "${General::swroot}/fwhosts/customnetworks";
 my $confighost         = "${General::swroot}/fwhosts/customhosts";
 my $color;
 my $confignet          = "${General::swroot}/fwhosts/customnetworks";
 my $confighost         = "${General::swroot}/fwhosts/customhosts";
index ea19e26f5904cfae7feb21b11ae948091e643bc7..03ef367465e71140ed02c5fb610bc3de8dabc70b 100644 (file)
@@ -341,7 +341,7 @@ END
                }       else { print $Lang::tr{'advproxy off'};  }
        }
        if ( $netsettings{'ORANGE_DEV'} ) { print <<END;
                }       else { print $Lang::tr{'advproxy off'};  }
        }
        if ( $netsettings{'ORANGE_DEV'} ) { print <<END;
-               <tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/dmzholes.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
+               <tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/forwardfw.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
                <td width='30%' align='center'>$netsettings{'ORANGE_ADDRESS'}
                <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
 END
                <td width='30%' align='center'>$netsettings{'ORANGE_ADDRESS'}
                <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
 END
index 0888145e28a752769c952a2cbfbdc38d38a9011b..df8405b520ab8371ea8a3ca8ae827ce636a6ee44 100644 (file)
@@ -120,8 +120,8 @@ iptables_red() {
                fi
 
                # Outgoing masquerading (don't masqerade IPSEC (mark 50))
                fi
 
                # Outgoing masquerading (don't masqerade IPSEC (mark 50))
-               #/sbin/iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN
-               #/sbin/iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE
+               /sbin/iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN
+               /sbin/iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE
 
        fi
 }
 
        fi
 }