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
Attempted fix that should convert the old carp[$i] naming to vip[$vhid]
Make sure we iterate by the vlan number lest we end up with a empty variable? Hopefully fix new vlan name not being assigned to interfaces section
Correct the gateway group member name to the correct GW_". strtoupper($if) uppercase. This fixes outbound load balancer pools upgraded from 1.2.3not working
Do not rely on php new foreach by reference and use the old method of chaning array members by using full path. This fixes nat 1:1 upgrades.
Change wording
Add support for IPv6 counters to the RRD graphs. This adds 4 more data sources in the rrd file.The graphing code colors are currently a mismatch and sorts waiting for someone with eyes to adjust to something usefulOther themes still need adjustingPackets graph isn't done, that needs the same modification as the traffic counters....
Merge branch 'master' into inc
Conflicts: etc/inc/captiveportal.inc etc/inc/config.console.inc etc/inc/config.lib.inc etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/ipsec.inc etc/inc/pkg-utils.inc etc/inc/shaper.inc...
Add the cron job a different way. There have been a couple reports of losing CAs during the config upgrade and this was the only added function at the time.
Bump config version, add upgrade code to setup cron job for URL table update script.
Ticket #491. Correct username/password name fields so upgrade works correctly.
Forgot to up the array count.
Add kern.ipc.maxsockbuf to upgrade config and remove extra whitespace.
Instead of replacing the whole array just add the new vlanif member to the config. Should fix issues reported in http://forum.pfsense.org/index.php/topic,28202.15.html
nuke trailing carriage returns
Merge remote branch 'mainline/master' into inc
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/gwlb.inc etc/inc/interfaces.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc...
Ticket #491. Do not actually check for enable to exist but for host since enable might be unset explicitly by the user. This should re-enable configs to work.
Store upgraded monitor IPs in gateway items, not accidentally as bogus interfaces. This was causing some configs to upgrade and then get stuck in a reassignment loop after the next reboot.
Make the RRD path if it doesn't yet exist at this point.
Remove hw.bce.tso_enable item it is loader.conf only per jimp
Some fixes for the upgrade code for captive portal users.
Remove the old field even if empty in rename_field.
Conflicts: etc/inc/PEAR.inc etc/inc/filter.inc
Remove trailing carriage return
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/priv.defs.inc etc/inc/system.inc etc/inc/upgrade_config.inc etc/inc/vpn.inc
Do some is_array() testing before renaming fields, otherwise empty variables can be accidentally created.
Mark this entry as an array before treating it as such otherwise php complains.
Check to see if it is not an array first - as per jim-p on IRC.
Fix crl upgrade code.
Add upgrade code for importing CRLs. Ticket #555
Rename 'name' to 'descr' for CA, Certificates, and CRLs, to gain CDATA protection and standardize field names. Ticket #320.
Generalize this function and use it in more places to reduce duplicated code.
Convert fullname field on users to descr, so it gains CDATA protection.
desc to descr in Load Balancer config, so they gain CDATA protection and standardize field names. Ticket #320.
Change the description field on sysctl tunables to be 'descr' and not 'desc' so they will gain CDATA protection. Ticket #320
Use proper matching because the command might contain nice in it.
Do not run anymore the cron job for monitoring check_reload_status since it has a monitoring process that does this through kqueue.
Conflicts: etc/inc/pkg-utils.inc
We want to upgrade all of interfaces/gateways.
Better initialize this.
Conflicts: etc/inc/filter.inc etc/inc/pkg-utils.inc etc/inc/service-utils.inc etc/inc/system.inc etc/inc/vpn.inc
Add upgrade code for NAT 1:1 rules and bump config version.
Base64 encode passowrd fields for safer operations. Suggested-by: Efonne(IRC)
Upgrade user data too for new pppoe world.
Correct function name. Pointy-hat: jimp@
Upgrade code to merge user certificates with normal certificates.
Upgrade code for pppoe.
Moving certs and ca out from under system. Provide upgrade code to move existing certs.