Skip to content

Commit 9ce725d

Browse files
committed
fixed a syntax error.
1 parent 87fb650 commit 9ce725d

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

install/dist/lib/fedora.lib.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,11 @@ public function configure_firewall()
440440
$tcp_public_services = '21 22 25 53 80 110 443 3306 8080 10000';
441441
$udp_public_services = '53';
442442
}
443+
if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
444+
$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']));
445+
if($row["tcp_port"]) != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ',".intval($conf['apache']['vhost_port'])."' WHERE server_id = ".intval($conf['server_id']));
446+
}
447+
443448
$content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content);
444449
$content = str_replace("{UDP_PUBLIC_SERVICES}", $udp_public_services, $content);
445450

install/dist/lib/opensuse.lib.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,15 @@ public function configure_firewall()
458458
$tcp_public_services = '21 22 25 53 80 110 443 3306 8080 10000';
459459
$udp_public_services = '53';
460460
}
461+
462+
if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
463+
$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']));
464+
if($row["tcp_port"]) != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ',".intval($conf['apache']['vhost_port'])."' WHERE server_id = ".intval($conf['server_id']));
465+
}
466+
461467
$content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content);
462468
$content = str_replace("{UDP_PUBLIC_SERVICES}", $udp_public_services, $content);
463-
469+
464470
wf("/etc/Bastille/bastille-firewall.cfg", $content);
465471

466472
if(is_file($dist_init_scripts."/bastille-firewall")) caselog("mv -f $dist_init_scripts/bastille-firewall $dist_init_scripts/bastille-firewall.backup", __FILE__, __LINE__);

install/lib/installer_base.lib.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,8 @@ public function configure_firewall()
728728
$tcp_public_services = '21 22 25 53 80 110 443 3306 8080 10000';
729729
$udp_public_services = '53';
730730
}
731-
if(!stristr($tcp_public_services, $conf['apache']['vhost_port']) {
731+
732+
if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
732733
$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']));
733734
if($row["tcp_port"]) != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ',".intval($conf['apache']['vhost_port'])."' WHERE server_id = ".intval($conf['server_id']));
734735
}

0 commit comments

Comments
 (0)