diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index a0da275601..f6c09309c8 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -795,7 +795,7 @@ function captiveportal_prune_old() { captiveportal_prune_old_automac(); if ($voucher_needs_sync == true) - /* Triger a sync of the vouchers on config */ + /* Trigger a sync of the vouchers on config */ send_event("service sync vouchers"); /* write database */ diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 68b007a835..45a0ca9e77 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2903,6 +2903,20 @@ EOD; $bogontableinstalled = 0; foreach ($FilterIflist as $on => $oc) { + $saved_tracker += 10; + $tracker = $saved_tracker; + + if(isset($config['system']['ipv6allow']) && ($oc['type6'] == "slaac" || $oc['type6'] == "dhcp6")) { + // The DHCPv6 client rules ***MUST BE ABOVE BOGONSV6!*** https://redmine.pfsense.org/issues/3395 + $ipfrules .= << "{$g['product_name']} webConfigurator Self-Signed Certificate", 'emailAddress' => "admin@{$config['system']['hostname']}.{$config['system']['domain']}", 'commonName' => "{$config['system']['hostname']}-{$cert['refid']}"); - $old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warings directly to a page screwing menu tab */ + $old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warnings directly to a page screwing menu tab */ if (!cert_create($cert, null, 2048, 2000, $dn, "self-signed", "sha256")){ while($ssl_err = openssl_error_string()){ log_error("Error creating WebGUI Certificate: openssl library returns: " . $ssl_err); @@ -1235,7 +1235,7 @@ mimetype.assign = ( url.access-deny = ( "~", ".inc" ) -######### Options that are good to be but not neccesary to be changed ####### +######### Options that are good to be but not necessary to be changed ####### ## bind to port (default: 80) @@ -1746,7 +1746,7 @@ function system_ntp_configure($start_ntpd=true) { } } - /* open configuration for wrting or bail */ + /* open configuration for writing or bail */ if (!@file_put_contents("{$g['varetc_path']}/ntpd.conf", $ntpcfg)) { log_error("Could not open {$g['varetc_path']}/ntpd.conf for writing"); return; diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc index bf7f285ecd..b77f09a2ef 100644 --- a/etc/inc/unbound.inc +++ b/etc/inc/unbound.inc @@ -304,7 +304,6 @@ rrset-cache-size: {$rrset_cache_size}m {$optimization['rrset_cache_slabs']} {$optimization['infra_cache_slabs']} {$optimization['key_cache_slabs']} -{$optimization['rrset_cache_size']} outgoing-range: 4096 {$optimization['so_rcvbuf']} {$anchor_file} diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 690db4596f..59f12e83d2 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -1869,7 +1869,7 @@ function upgrade_052_to_053() { if (!is_array($config['cert'])) $config['cert'] = array(); - /* migrate advanced admin page webui ssl to certifcate mngr */ + /* migrate advanced admin page webui ssl to certificate manager */ if ($config['system']['webgui']['certificate'] && $config['system']['webgui']['private-key']) { @@ -2631,7 +2631,7 @@ function upgrade_078_to_079() { function upgrade_079_to_080() { global $config; - /* Upgrade config in 1.2.3 specifying a username other than admin for synching. */ + /* Upgrade config in 1.2.3 specifying a username other than admin for syncing. */ if (!empty($config['system']['username']) && is_array($config['installedpackages']['carpsettings']) && is_array($config['installedpackages']['carpsettings']['config'])) { $config['installedpackages']['carpsettings']['config'][0]['username'] = $config['system']['username']; @@ -2985,7 +2985,7 @@ function upgrade_088_to_089() { if (!is_array($config['cert'])) $config['cert'] = array(); - /* migrate captive portal ssl to certifcate mngr */ + /* migrate captive portal ssl to certificate manager */ if (is_array($config['captiveportal'])) { foreach ($config['captiveportal'] as $id => &$setting) { if (isset($setting['httpslogin'])) { diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 1630b477a7..97c1267227 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -956,9 +956,9 @@ function get_configured_carp_interface_list($carpinterface = '', $family = 'inet switch ($what) { case 'subnet': if ($family == 'inet' && is_ipaddrv4($vip['subnet'])) - return "{$vip['subnet']}/{$vip['subnet_bits']}"; + return $vip['subnet_bits']; else if ($family == 'inet6' && is_ipaddrv6($vip['subnet'])) - return "{$vip['subnet']}/{$vip['subnet_bits']}"; + return $vip['subnet_bits']; break; case 'iface': if ($family == 'inet' && is_ipaddrv4($vip['subnet'])) diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc index f9b41b35f5..f6b7248a20 100644 --- a/etc/inc/voucher.inc +++ b/etc/inc/voucher.inc @@ -284,7 +284,7 @@ function voucher_expire($voucher_received) { $unsetindexes[] = $cpentry[5]; } } else - captiveportal_syslog("$voucher ($roll/$nr): not found on any registererd Roll"); + captiveportal_syslog("$voucher ($roll/$nr): not found on any registered Roll"); } else // hmm, thats weird ... not what I expected captiveportal_syslog("$voucher invalid: {$output[0]}!!"); @@ -296,7 +296,7 @@ function voucher_expire($voucher_received) { voucher_write_active_db($roll, $active); unset($active_vouchers); - /* Triger a sync of the vouchers on config */ + /* Trigger a sync of the vouchers on config */ send_event("service sync vouchers"); } @@ -412,8 +412,8 @@ function voucher_auth($voucher_received, $test = 0) { } } } else { - $test_result[] = "$voucher ($roll/$nr): not found on any registererd Roll"; - captiveportal_syslog("$voucher ($roll/$nr): not found on any registererd Roll"); + $test_result[] = "$voucher ($roll/$nr): not found on any registered Roll"; + captiveportal_syslog("$voucher ($roll/$nr): not found on any registered Roll"); } } else { // hmm, thats weird ... not what I expected @@ -480,7 +480,7 @@ function voucher_auth($voucher_received, $test = 0) { $active_vouchers[$first_voucher_roll][$first_voucher] = "$timestamp,$minutes"; voucher_write_active_db($first_voucher_roll, $active_vouchers[$first_voucher_roll]); - /* Triger a sync of the vouchers on config */ + /* Trigger a sync of the vouchers on config */ send_event("service sync vouchers"); unlock($voucherlck); @@ -560,7 +560,7 @@ function voucher_configure_zone($sync = false) { $timestamp = $activent['timestamp']; $minutes = $activent['minutes']; // its tempting to check for expired timestamps, but during - // bootup, we most likely don't have the correct time time. + // bootup, we most likely don't have the correct time. $active_vouchers[$voucher] = "$timestamp,$minutes"; } } @@ -613,7 +613,7 @@ function voucher_read_active_db($roll) { if ($dirty) { // if we found expired entries, lets save our snapshot voucher_write_active_db($roll, $active); - /* Triger a sync of the vouchers on config */ + /* Trigger a sync of the vouchers on config */ send_event("service sync vouchers"); } } @@ -735,7 +735,7 @@ function voucher_save_db_to_config_zone() { unlock($voucherlck); - write_config("Synching vouchers"); + write_config("Syncing vouchers"); return; } diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index a26f61a184..5e5692bd70 100644 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -180,16 +180,6 @@ if ($_POST) { if (empty($_POST['password'])) $input_errors[] = gettext("You must specify a CARP password that is shared between the two VHID members."); - if (is_ipaddrv4($_POST['subnet'])) { - $parent_ip = get_interface_ip($_POST['interface']); - $parent_sn = get_interface_subnet($_POST['interface']); - $subnet = gen_subnet($parent_ip, $parent_sn); - } else if (is_ipaddrv6($_POST['subnet'])) { - $parent_ip = get_interface_ipv6($_POST['interface']); - $parent_sn = get_interface_subnetv6($_POST['interface']); - $subnet = gen_subnetv6($parent_ip, $parent_sn); - } - if ($_POST['interface'] == 'lo0') $input_errors[] = gettext("For this type of vip localhost is not allowed."); else if (strpos($_POST['interface'], '_vip')) @@ -211,6 +201,7 @@ if ($_POST) { $cannot_find = $_POST['subnet'] . "/" . $_POST['subnet_bits'] ; $input_errors[] = sprintf(gettext("Sorry, we could not locate an interface with a matching subnet for %s. Please add an IP alias in this subnet on this interface."),$cannot_find); } + unset($parent_ip, $parent_sn, $subnet); } break; default: diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php index 0fd62f0863..bb68e63b26 100644 --- a/usr/local/www/interfaces_bridge_edit.php +++ b/usr/local/www/interfaces_bridge_edit.php @@ -344,7 +344,7 @@ function show_source_port_range() { - +
- +
- +
- +
- +
$ifdescr) - echo ""; + echo ""; ?>
{$ifdescr}
{$ifdescr}
@@ -407,7 +407,7 @@ function show_source_port_range() { $ifdescr) - echo ""; + echo ""; ?>
{$ifdescr}
{$ifdescr}
@@ -424,7 +424,7 @@ function show_source_port_range() { - +
@@ -434,7 +434,7 @@ function show_source_port_range() { - +