Fix packet graph label alignment
Fix the graph label alignment
Merge remote branch 'upstream/master'
Fix config sync issue. Resolves #1547 Fixed-by: Ermal
Fix clearing of PPTP/PPPoE/L2TP server raw logs. Fixes #1340
Correct password variable name for input validation test on PPTP users. Fixes #1239
Reject alias names that are too long. Fixes #1510
Show the DUID instead of the MAC. Fix online test.
Misc DHCPv6 lease view improvements (at least shows the IP...)
Micro optimization.
Fixes #1522. Call interface reconfigure so we bring down the interface and than re-configure it.
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.
fix missing images for CRLs
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.
Make sure all CP form elements are disabled/enabled with the master checkbox.
Fixup MAC display on this other path too
Print the MAC mfg on another line in a smaller font if it's found. Less obtrusive than completely replacing the MAC.
Use base 1000 on user graphs and display cumulative of Total users logged in over the 'x' period.
Merge branch 'master' into smos-ipv6
Conflicts: etc/inc/pfsense-utils.inc
MAC prefix to vendor resolution at Status->Interfaces, Status->DHCP leases, Diagnostics->ARP table
Merge branch 'axscode-pfs'
Merge branch 'master' into yakatz-ssl
Merge branch 'drcookie-he.net'
Teach row_helper about ipv6, should fix issue found here:http://forum.pfsense.org/index.php/topic,36709.0.html
Added HE.net (dns.he.net) to the list of available dyndns services.
Fix interface recognition for diag > arp. It was't seeing wireless interfaces properly.
Fix whitespace.
Sync with dhcp leases reading code.
Conflicts: etc/inc/vslb.inc etc/version
Fix comment
Also skip the rewind binding state or leases show expired. Reported at http://forum.pfsense.org/index.php/topic,36657.0.html
Revert this change. reload_all() already sends a reload message. Unfortunately there is still something else lurking that causes a delay when loading the wizard step
Use send_event()
Use send_message and issue the reload all operation in the background
Make autocomplete on the login form optional.
Skip step #9 for non pfSense branded installations
Various CRL fixes, handle empty internal CRLs better.
Reload the wizard and then redirect to a wizard completed step. Prompt the user to donate to the project.
Fix the input validation, typo in the field name. Mark the prefix delegation range as not required.
Add a prefix pool for prefix delegation. Doesn't work yet. ISC dhcpd complaining about the network mask being too short.
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mterron-clone into review/master
Misc fixes to make the openvpn wizard stop re-creating a CA previously made via the wizard if you re-ran the wizard and chose a CA instead. Fixes #1512
this should be checking for synchronizetoip not pfsyncpeerip
If we are disabling the radius inputs, also disable the secondary radius inputs.
This field should be server2
Add DHCP-PD support if the WAN interface is set to DHCP.Select a DHCP-PD prefix length in correspondence with your ISP. If set to "none" it will not be requested and normal DHCPv6 is performed.You can set a link local IPv6 address on the LAN interface and select a DHCP-PD Prefix number from the drop down....
Misc OpenVPN CRL selection fixes.
Add a field for the prefix pools. Fix the DUID check
When deleting a CA, delete its associated CRLs.
Fix the parse error, missing bracket.
Add backend support for the dhcp v6 client
Correct wrong key for checking if a interface type switched. Ticket #1420
Remove the dhcp6 type, add the DUID field to the dhcp config.
More DHCPv6 server fixes, split the function out into seperate v4 and v6. Make the router advertisement stand alone on the dhcp server page.
Conflicts: usr/local/www/status_rrd_graph_img.php
Set default colors explicity, the theme can then override them. This prevents missing colors in themes from crashing the graphs.
If the rrd multiplier is negative, use 5% for out instead of 95% for the 95th percentile line.
Set password on the OS instead of just the gui. Fixes #1485
Correct saving of qinq specified members and also correctly destroy parent vlan when deleteing the interfaces. Also take care of attaching to netgraph now that we detach by default.
Correct code description during assignment
fix typo
Comment out debug print
Whitespace cleanup, code cleanup, add choice to filter on ipv4/ipv6 and also accept a subnet to filter on via the host field.
Allow users to select SSL/TLS+User Auth with external authentication sources.
No need to include head.inc twice
Show OpenVPN instances on Status > Traffic Graphs, with descriptions.
Add ipv6 tunnel remote subnets
Provide a method for rebrands to force a theme. Otherwise upgrading nanobsd from pfSense to a rebrand image without the theme in the config.xml will have a broken GUI since the theme isn't there.
missed a bit of my last commit
Set user when removing privileges, otherwise things like the user's shell would not be reset until pressing save, which is inconsistent with that step not being needed when adding privileges.
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline.git
checking moduli of ssl csr request and response
Reject encrypted CA private keys. Resolves #1446
override option for certificate subject mismatch
Add an option under advanced->misc to specify a proxy for retreiving pfsense package info or downloading packages.
Only start log update ajax timer if the updateDelay is defined. http://forum.pfsense.org/index.php/topic,35771.0.html
Surround the IPv6 address with brackets
Properly add dns and wins fields, load them on page load.
Properly set/unset voucher enable/disable bit.
Move the link to add a gateway up next to the drop-down box so it is more obvious.
Change the wording and the link placement for adding a new gateway
Make it possible to add a IPv6 gateway using the ajax add button
Test if a variable is set before trying to unset it. If a user has no rules in their config, then $config['filter'] would not be undefined, so unsettings $config['filter']['bypassstaticroutes'] would result in an error. http://forum.pfsense.org/index.php/topic,35702.0.html
Add missing fields for l2tp to define dns and wins servers
Also exclude grep from running processes when grepping for a running packet capture. Also, fix other test to match the recent changes made.
Conflicts: etc/inc/filter.inc usr/local/www/themes/the_wall/rrdcolors.inc.php
Add a toggle under System > Advanced on the misc tab to enable/disable debug mode for racoon.
Fix copy/paste error
Make sure a theme directory actually exists before blindly using it.
Remove extra variable set
Remove copy paste
Unbreak check if capture is running
When using ' variables are not expanded. Use double quotes so that the variable is exanded
Don't test for a user cert here either, see previous commit.