webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next

Browse Source
This commit is contained in:
Christian Schmidt
2011-07-06 19:30:11 +02:00
parent a5b0d8bf9e 85cbc0a08f
commit e1b8a85323
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/50/filelists/files
View File

@@ -3,6 +3,7 @@ var/ipfire/langs/
etc/rc.d/init.d/console etc/rc.d/init.d/console
usr/local/sbin/setup usr/local/sbin/setup
var/ipfire/graphs.pl var/ipfire/graphs.pl
srv/web/ipfire/cgi-bin/portfw.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/logs.cgi/log.dat
usr/local/share/GeoIP/GeoIP.dat usr/local/share/GeoIP/GeoIP.dat
usr/share/hwdata/pci.ids usr/share/hwdata/pci.ids

1
config/rootfiles/core/50/filelists/squid Symbolic link
View File

@@ -0,0 +1 @@
../../../common/squid

2
html/cgi-bin/index.cgi
View File

@@ -370,7 +370,7 @@ END
} else { } else {
foreach my $line (@status) { foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
($line =~/ $confighash{$key}[1]\{.*INSTALLED/ )) ($line =~/$confighash{$key}[1]\{.*INSTALLED/ ))
{ {
$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
} }

2
html/cgi-bin/portfw.cgi
View File

@@ -1038,7 +1038,7 @@ sub disallowreserved
{ {
# port 67 and 68 same for tcp and udp, don't bother putting in an array # port 67 and 68 same for tcp and udp, don't bother putting in an array
my $msg = ""; my $msg = "";
my @tcp_reserved = (81,222,444); my @tcp_reserved = ();
my $prt = $_[0]; # the port or range my $prt = $_[0]; # the port or range
my $ryn = $_[1]; # tells us whether or not it is a port range my $ryn = $_[1]; # tells us whether or not it is a port range
my $prot = $_[2]; # protocol my $prot = $_[2]; # protocol

2
html/cgi-bin/vpnmain.cgi
View File

@@ -2540,7 +2540,7 @@ END
my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
foreach my $line (@status) { foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
($line =~ / $confighash{$key}[1]\{.*INSTALLED/)) ($line =~ /$confighash{$key}[1]\{.*INSTALLED/))
{ {
$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
} }

4
lfs/squid
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 3.1.11 VER = 3.1.13
THISAPP = squid-$(VER) THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.bz2 DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1 $(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934
install : $(TARGET) install : $(TARGET)

4
src/misc-progs/ipsecctrl.c
View File

@@ -59,9 +59,9 @@ void open_physical (char *interface, int nat_traversal_port) {
// safe_system(str); // safe_system(str);
// IKE // IKE
sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT >/dev/null 2>&1", interface); sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT >/dev/null 2>&1", interface);
safe_system(str); safe_system(str);
sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT", interface); sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT", interface);
safe_system(str); safe_system(str);
if (! nat_traversal_port) if (! nat_traversal_port)