mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Evgeny Yurchenko 2011-06-01 18:29:55 -04:00
commit fc3dcc8b00
7 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/inc/gwlb.inc
View File

@ -367,7 +367,7 @@ function return_gateway_groups_array() {
$gateways_arr = return_gateways_array();
$gateway_groups_array = array();
if (0) {
if (isset($config['system']['gw_switch_default'])) {
/*
* NOTE: The code below is meant to replace the default gateway when it goes down.
* This facilitates services running on pfSense itself and are not handled by a PBR to continue working.

2
etc/inc/system.inc
View File

@ -1256,7 +1256,7 @@ function system_reboot_cleanup() {
captiveportal_radius_stop_all();
require_once("voucher.inc");
voucher_save_db_to_config();
mwexec("/etc/rc.stop_packages");
// mwexec("/etc/rc.stop_packages");
}
function system_do_shell_commands($early = 0) {

2
usr/local/www/firewall_rules.php
View File

@ -126,12 +126,12 @@ if($_REQUEST['dragdroporder']) {
$icmptypes = array(
"" => gettext("any"),
"echoreq" => gettext("Echo request"),
"echorep" => gettext("Echo reply"),
"unreach" => gettext("Destination unreachable"),
"squench" => gettext("Source quench"),
"redir" => gettext("Redirect"),
"althost" => gettext("Alternate Host"),
"echoreq" => gettext("Echo"),
"routeradv" => gettext("Router advertisement"),
"routersol" => gettext("Router solicitation"),
"timex" => gettext("Time exceeded"),

2
usr/local/www/firewall_rules_edit.php
View File

@ -746,12 +746,12 @@ include("head.inc");
<?php
$icmptypes = array(
"" => gettext("any"),
"echoreq" => gettext("Echo request"),
"echorep" => gettext("Echo reply"),
"unreach" => gettext("Destination unreachable"),
"squench" => gettext("Source quench"),
"redir" => gettext("Redirect"),
"althost" => gettext("Alternate Host"),
"echoreq" => gettext("Echo"),
"routeradv" => gettext("Router advertisement"),
"routersol" => gettext("Router solicitation"),
"timex" => gettext("Time exceeded"),

10
usr/local/www/interfaces_vlan_edit.php
View File

@ -97,9 +97,13 @@ if ($_POST) {
if (!$input_errors) {
if (isset($id) && $a_vlans[$id]) {
if ($a_vlans[$id]['if'] != $_POST['if'])
// Destroy previous vlan
pfSense_interface_destroy($a_vlans[$id]['if']);
if (($a_vlans[$id]['if'] != $_POST['if']) || ($a_vlans[$id]['tag'] != $_POST['tag'])) {
if (!empty($a_vlans[$id]['vlanif']))
// Destroy previous vlan
pfSense_interface_destroy($a_vlans[$id]['vlanif']);
else
pfSense_interface_destroy("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}");
}
}
$vlan = array();
$vlan['if'] = $_POST['if'];

15
usr/local/www/system_advanced_misc.php
View File

@ -56,6 +56,7 @@ $pconfig['proxyuser'] = $config['system']['proxyuser'];
$pconfig['proxypass'] = $config['system']['proxypass'];
$pconfig['harddiskstandby'] = $config['system']['harddiskstandby'];
$pconfig['lb_use_sticky'] = isset($config['system']['lb_use_sticky']);
$pconfig['gw_switch_default'] = isset($config['system']['gw_switch_default']);
$pconfig['preferoldsa_enable'] = isset($config['ipsec']['preferoldsa']);
$pconfig['racoondebug_enable'] = isset($config['ipsec']['racoondebug']);
$pconfig['maxmss_enable'] = isset($config['system']['maxmss_enable']);
@ -106,6 +107,11 @@ if ($_POST) {
else
unset($config['system']['lb_use_sticky']);
if($_POST['gw_switch_default'] == "yes")
$config['system']['gw_switch_default'] = true;
else
unset($config['system']['gw_switch_default']);
if($_POST['preferoldsa_enable'] == "yes")
$config['ipsec']['preferoldsa'] = true;
else
@ -271,6 +277,15 @@ function maxmss_checked(obj) {
"robin."); ?>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Load Balancing"); ?></td>
<td width="78%" class="vtable">
<input name="lb_use_sticky" type="checkbox" id="gw_switch_default" value="yes" <?php if ($pconfig['gw_switch_default']) echo "checked=\"checked\""; ?> />
<strong><?=gettext("Allow default gateway switching"); ?></strong><br/>
<?=gettext("If the link where the default gateway resides fails " .
"switch the default gateway to another available one."); ?>
</td>
</tr>
<tr>
<td colspan="2" class="list" height="12">&nbsp;</td>
</tr>

2
usr/local/www/system_usermanager.php
View File

@ -49,7 +49,7 @@
require("certs.inc");
require("guiconfig.inc");
if (isAllowedPage("system_usermanager")) {
if (isAllowedPage("system_usermanager.php*")) {
// start admin user code
$pgtitle = array(gettext("System"),gettext("User Manager"));