Merge branch 'master' of github.com:pfsense/pfsense
shouldn't need this as its own inc anymore, but only changing in master since 2_2 nearing release
Merge remote-tracking branch 'upstream/master' into origin/master
Proper fix #4443, do not unset carp entry when content differ, also set correct real interface and use subnet to check IP protocol
Save vip interface and subnet to use to delete old vips from secondary nodes. Fixes #4446
Revert "Use a consistent variable name here. related to Ticket #4446"
This reverts commit 309162b96d6ad0db09c132cc0aabc890bfe1909f.
Use a consistent variable name here. related to Ticket #4446
Conflicts: usr/local/www/xmlrpc.php
Revert "Fixes #4446 Correct ipalias removal on top of carp during configuration sync."
master works differently and get_real_interface() resolves vips as well.
This reverts commit 8896fe1cebdc97dcbeb59249f3bb2abd1601b979.
Fixes #4446 Correct ipalias removal on top of carp during configuration sync.
Remove extra closing brackets
correct a few typos that made these files unparsable
services_unbound - added missing $-sign to variablexmlrcp - removed redundant closing brackets. Some trailing whitespacealso got removed
Ticket #3997, teach code to track carp through uniqids(). Missing carp GUI changes and upgrade code
Fix lineup of copyright lines
and module names and other bits of formatting and typos in headercomment sections.
Welcome 2015
Move this check before full sync to disable dnsmasq/unbound in the first time it's sync'd
Add dnsmasq and unbound config sections to full sync, it fixes #4076 that is caused because boolean config fields are not disabled on secondary
Add DNS Resolver to the list of services to be sync'd on HA, make sure it and DNS Forwarder are not enabled simultaneously. It fixes #4067
Properly remove IPv6 carp vips as reported from https://forum.pfsense.org/index.php?topic=84392.0
modify copyright statement to reflect reality
rename interfaces_carp_setup to interfaces_sync_setup and call it during bootup since it does not only relate to carp interfaces.
Fix operator
Do not reconfigure dhcpd twice on secondary after config sync. Fixes #3797
Use function_exists test
Use require_once in more places
Ensure config is global here
Ensure to reconfigure Unbound for filter configuration on XMLRPC
Remove references to _vip interface and provide proper configuration for carp on FreeBSD 10. Still some places to deal with this and certainly missing upgrade code
Make sure to account for IP aliases on lo0 here, or they get duplicated on each CARP sync
s/require/require_once/g for filter.inc to avoid redeclaration errors in some rare cases.
Also take dhcpv6 into consideration even here.
Actually do not allow the loop to continue. Related to Ticket #1928
Copy full dhcpd conf from master to slave. Fixes #2600
Make sure we create / delete SPDs and SADs on secondary node when it changes on primary. Fixes #2303
Fully sync filter and nat sections. Fixes #2362
Fixes #1928. Disallow sync loop only for certain types of calls but not for exec_[php|shell]. Also fix CARP loop detection to use correct variable
Remove a couple of call-time pass-by-reference for interface_ipalias_configure()
Get rid of carpdev, it will never be
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
Some sections should just be copied and not merged or we end up unable to sync the deletion of the last item in a section.
Log when XMLRPC auth fails so that the brute force lockout will kick in.
NEw functiong does_vip_exist() which works for carp and ipalias type vips to help in carp sync issues. Fixes #1598
Do not assume that every merge is about vips. Found-by: Jim
unset after checking that no reconfiguring is needed.
Actually make this code more readble.
Remove the entry from old entries even when there are no changes to prevent marking them down.
Generate proper index for unsetting so we do not destroy all the vips in the backup.
Use array_overlay()
Use array_extend
Remove debugging code
Add merge handler code
Fix config sync issue. Resolves #1547 Fixed-by: Ermal
Micro optimization.
Ticket #1534, #1433. Remove custom sync code for vip, since it array_merge() replaces same keys data when merging. But make the code for reloading only changed vips after merge better and some more checks.
Ticket #1534, #1433. Properly merge carp interfaces and do not reload carp interfaces that have not change any configuration parameter. Also make merge_config_section_xmlrpc() an alias for restore_config_section_xmlrpc() since that what it is.
Ticket #1534. Serialize all the xmlrpc requests coming to the firewall. Seems such request can stomp into each other and create either corruption of xmlrpc request or other issues.
Allow ipalias with carp as parent interface to be synchronized.
Ticket #959. Keep local items at the top of vip section
Be consistent on shifting array during authentication. Also check for array to avoid strange errors.
Actually the passed config sections are part of index 1 of the array. This fixes config sync of vips as well.
Fix config synchronization. Also unbreak the config when erroring out because it will loop indefinitely.
Fix line because of copy/pasto.
Its too late and this is optional.
Actually we expect an array to be returned.
Hello xmlrpc to another function!
Whitespace fixes to make this readble.
Ticket #975. Rearrange code a little.
Ticket #959: keep local ipalias and proxyarp vip's during a XMLRPC restore
No need to triger a vips re-configure explicitly but rather detect this during config merges. This is the best way to do this after fixing Ticket #601.
Ticket #601. If 'virtualip' section is going to be restored or merged through xmlrpc bring down all vips which will be brough up later on from the configure_carp call. This ensures that the peers on the cluster stay current to each other.
Not neccessary to call this here since vips_configure does this automatically.
Fix printf/sprintf mixups.
Merge remote branch 'mainline/master'
Conflicts: usr/local/www/services_dhcp_edit.php
Optionally sync users and groups via xmlrpc. Fixes #650
Resync DNS forwarder post-sync. Fixes #117
Backout this commit, it was never intended to be committed
Conflicts: usr/local/www/carp_status.php usr/local/www/diag_nanobsd.php usr/local/www/services_captiveportal_ip_edit.php
Implement gettext() calls on xmlrpc.php
Adding utility to show and maintain overflow tables
Restart dhcpd and OpenVPN on backup box. Fixes #646 - Helps ticket #645 but that still needs work.
Correct carp_configure_doc
Correctly reload carp interfaces via xmlrpc
vslb.inc is already included by functions.inc
Its 2010
Clean up file formatting. Fix typo. Add (C)
Return 'Authentication failed' instead of a non standard type which results in kindOf() errors.
When exec_php is called detect i the variable toreturn is present and if so forumulate it into a xmlresponse in order to return structured data.
Unbreak configuration sync. Resolves #182
s/interfaces_carp_configure/interfaces_carp_setup/
Require filter.inc and shaper.inc
Rewrite the pfsense privilege system with the following goals in mind ...
1) Redefine page privileges to not use static urls2) Accurate generation of privilege definitions from source3) Merging the user and group privileges into a single set4) Allow any privilege to be added to users or groups w/ inheritance...
move relayd to after all gateways are configured - it'll be happier, trust me
Setup gateways monitor after a rpc sync
s/slbd/relayd/ move to after filter is configured
Eliminate interfaces_carp_bring_up_final()
PHP5 fixes. Allow XMLRPC sync to work.
Add product_copyright re-branding supportAdd product_copyright_years re-branding supportAdd product_website re-branding supportAdd product_email re-branding support
Work sponsored-by: Centipede Networks
sync from RELENG_1_2