Make limiters have a schedule specified which applie bandwidth limits during that period
Due to the DHCP pool tag needing to be an array, rename the old LB "pool" variable to something else so it's not interpreted as an array.
Ensure this gets a set default value or things can break
Remove ca reference
Implement certificate chain in Captive Portal
Use Certificate Manager in Captive Portal settings
Change ereg_replace to preg_replace() function
Generalize the Crypto hardware option and add GUI support for AES-NI.
Make sure we tag all 2.0 gateways as being IPv4, in 2.1 we require this tag to be present for the gateways.This should prevent duplicate gateway entries for people coming from 2.0 that have dynamic interfaces
Correct upgrade code from report of http://forum.pfsense.org/index.php/topic,50182.0.html
Fixes #2428. Reference limiters in rules by name to avoid issues. Also put upgrade code for existing configs. The same fix is necessary for 2.0.x though not sure how this should be committed there.
Include util.inc and IPv6.inc before config.lib.inc.Several parts of the config upgrade relay on functions in these.
Make sure we include "util.inc" during config upgrade. We need is_ipaddrv4() during upgrade which is triggered from gwlb.inc
Rename old RRD quality database to the new GW name so we continue the graph.
Fix reference updating for when more than one carp vip exists. Skip the upgrade code if no carp vip defined. Ticket #2445
Add missing declaration for global variable $g where it is used.
Fix name of the config section for virtual IPs in upgrade code. Ticket #2445
Check the surrounding characters to not allow partial matches. Ticket #2445
Revert "Rather do a fix by going through vips in reverse order"
This reverts commit d996dfeab2ec40cf3fb44b51811333b40ed5073f.
Do this only for carp type vips
Rather do a fix by going through vips in reverse order
Since this is an interface to avoid issues arising from vip1 and vip11 existing and replacing vip1 will replace even vip11, put on the regex <(starting close tag).
Move vip upgrade code to be later, since it was backed out of 2.0.x it no longer needs to be so early, and otherwise there can be some breakage/fallout. Ticket #2445
Ooops use correct name for vips
Oops this should be sed and not sh. Fixes #2445
Make sure to push elements we don't recognize on the stack too.
Add upgrade code that updates the dynamic gateway names to their new format new $if_$type.Redmine Ticket #2332. I've tested a simple upgrade with 3 dynamic Wans with varying names and that appears to have succeeded. Needs more testing.
Feature #2123 Backup RRD files using the xml dump and restore from RRD tools
http://redmine.pfsense.org/issues/2123
Remove slipped line
Make vips vhid be unique per parent interface!
Move CARP settings from pkg XML to a real PHP page
https://redmine.pfsense.org/issues/647
Unbreak the upgrade_config.inc, sorry
More memory optimizations for the RRD upgrade. Ticket #1758 #2159
Update the upgrade function so we use less memory here too to make sure it succeeds on Nano.Related to ticket. #2159 #1758
Fixes #1999. Upgrade bvoucher config as well during CP upgrade to multi-instance
PPTP upgrade needs to declare $config a global.
Fix LZO setting for Upgraded OpenVPN (was turning compression on even if old config had it disabled.)
Fix upgrade code for 1.2.3 with assigned OpenVPN interface.
Don't ignore when multiple OpenVPN DNS, NTP, WINS, etc servers were specified in 1.2.3 when upgrading. 1.2.3 separated by ;, 2.x uses separate vars.
Safer for 1.2.3 upgrades to assume OpenVPN interface == any, since 1.2.3 didn't have a way to bind to an interface. Otherwise people accepting connections on opt interfaces on 1.2.3 will break on upgrade until the proper interface is selected in the GUI
Unbreak a number of explode() replacements which required preg_split()
The function split() is replaced by the function explode(). Starting with PHP 5.3 this is deprecated and with version 6 gone.Replacing it surpresses all the warnings
Convert MTU from 1.2.3 to MSS on 2.0, fixes #1886
Fix SMTP monitor check in upgrade code, too.
Fix the 2nd grow command, add spaceTicket #1758
Ok, let's try not to corrupt the RRD files on upgrade. Leave the RRA archives for the 720 minutes average at 1000.Then run a rrdtool resize command to grow the RRA by 1000 and 2000 for the 60 and 720 average respectively.Attempts to further fix ticket #1758
Add the OOM memory restructuring fix from Ticket #1758 into mainline for nanoBSD upgrades.
Move the old databases to the backup folder in confFixes ticket #1758
Restore the RRD backup before attempting a migration as this bites the nanobsd users.We immediately backup the new databases to a new rrd.tgz file. The old database will be moved to /rootFix for ticket #1758
Add the multi instance CP to master branch. This allows to define CP with different properties on different interfaces.
Merge remote-tracking branch 'upstream/master'
Conflicts: etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/interfaces.inc etc/inc/services.inc etc/inc/xmlrpc_client.inc usr/local/www/fbegin.inc usr/local/www/services_dhcp.php
Merge remote-tracking branch 'mainline/master' into inc
Conflicts: etc/inc/priv.defs.inc
Merge remote branch 'upstream/master'
Check if an item is an array before treating it as such in the upgrade code.
Add proper checks in auth code for testing if the section has been set in the config. Also do the same in the ugprade code
In upgrade code for server load balancing, set redirect_mode. Also in the backend code, assume redirect_mode as the default if it's not set.
Fix off-by-one in OpenVPN "local" to "ipaddr" conversion.
Add LB monitor types to config during upgrade, or they will be missing from boxes upgraded from 1.2.3.
Conflicts: etc/inc/globals.inc etc/inc/upgrade_config.inc
Upgrade sync username to latest config version.
Conflicts: etc/inc/voucher.inc usr/local/www/fbegin.inc
Conflicts: conf.default/config.xml etc/inc/filter.inc etc/inc/globals.inc etc/inc/pfsense-utils.inc etc/inc/upgrade_config.inc usr/local/www/interfaces.php
Rather make use of $global variable for RRD path.
Remove out-dated RRD file as it will cause broken images to appear on RRD graphs page.
Conflicts: etc/inc/interfaces.inc etc/inc/upgrade_config.inc etc/inc/vpn.inc
When converting 1.2.3 LB pools to 2.0 gateway groups, strip invalid characters from the group names and update any rules referencing the old name. Fixes #1515
Fix PPTP server radius settings upgrade from 1.2.3. Fixes #1292
Conflicts: usr/local/www/status_rrd_graph_img.php
Remove rndtest sysctl since the kernel module is not anymore part of our kernels. Leftover noticed by: Jim
Conflicts: etc/inc/pfsense-utils.inc
Fix PPPoE upgrade, the <pppoe> tag is considered an array these days and the upgrade code wasn't treating it properly, accessing it directly instead of using the first entry ([0]). Fixes #1439 - PPPoE credentials upgrade properly now.
Conflicts: etc/inc/gwlb.inc
Conflicts: etc/inc/filter.inc usr/local/www/themes/the_wall/rrdcolors.inc.php
CRL is read in as an array now, so even in the imported config it will appear to be an array even though it can only have one value. Fixes #1358
Conflicts: etc/inc/voucher.inc
Check for "aes 256" as IPsec encryption type, not just rijndael.
Add some upgrade code for IPsec mobile clients. Passes php -l but needs more testing.
Conflicts: etc/inc/interfaces.inc etc/inc/priv.defs.inc etc/inc/shaper.inc etc/inc/system.inc
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc etc/inc/priv.defs.inc etc/inc/services.inc...
Keep a table of gateways we added for static routes to prevent us from making multiple entries to the same IP address
Enable the IPv6 allow toggle, otherwise the other IPv6 rules do not work.
Merge the config upgrade code, there was a mismatch, the one who merged this wrong should get a pointy hat.
Resolve merge conflict
Only change protocol if it's set and not empty.
Add upgrade code to ensure rule protocols are all lower case.
Fix admins group permission setting when upgrading from 1.2.3.
Correct IPsec carp interface upgrade code, off by one
Use full path to pw
Add missing _relayd group, and when upgrading from 1.2.3, add _relayd group and user.
Correct the vlan upgrade code to continue when we fixed up the interface
Correct the config path to the vip array