summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Encode parameters in shaper queues before display.RELENG_2_2_6jim-p2015-12-211-6/+6
|
* Only disable CSRF on diag_backup.php for the download action where it might ↵jim-p2015-12-211-1/+3
| | | | be scripted. Other actions need its protection.
* Encode hostname before printing; remove some related dead code.jim-p2015-12-217-26/+7
|
* Encode gateway attributes before printing.jim-p2015-12-212-5/+5
|
* Encode DNS servers and their associated gateways before printingjim-p2015-12-211-2/+2
|
* bump to 2.2.6-RELEASEChris Buechler2015-12-181-1/+1
|
* Add range validation to CP IP passthrough. Ticket #5655Chris Buechler2015-12-171-3/+10
|
* add validation to MAC passthrough. Ticket #5655Chris Buechler2015-12-171-2/+10
|
* Flush zone's tables if its db must be reset to avoid leaving behind any ↵Chris Buechler2015-12-171-1/+14
| | | | table entries. Ticket #5622
* Wrong source of syntax error. Revert "fix syntax error in ipfw command to ↵Chris Buechler2015-12-171-1/+1
| | | | | | disable on inactive interfaces" This reverts commit 6310eaa2c75424da6a322a956bbf228b36222918.
* fix syntax error in ipfw command to disable on inactive interfacesChris Buechler2015-12-171-1/+1
|
* Add busytimeout of 60 seconds for CP database access. This matches the ↵Chris Buechler2015-12-171-0/+4
| | | | default value PHP uses with sqlite 2.x versions (pfSense 2.1.x and earlier) and prevents the issues noted in Ticket #5622
* Change status.php state dump to use -vvss for more verbose info, add kenv ↵jim-p2015-12-171-1/+3
| | | | and pbi_info.
* add these three strongswan libs to the obsoletedfiles list. They haven't ↵Chris Buechler2015-12-161-0/+3
| | | | been included in any releases, but were briefly included in snapshots in mid April 2015.
* Merge pull request #2061 from phil-davis/patch-7Chris Buechler2015-12-151-6/+20
|\
| * Limit alias info popup size #5415 RELENG_2_2Phil Davis2015-11-111-6/+20
| | | | | | This is code for RELENG_2_2 pfSense 2.2.5 that will limit the number of rows in the alias info popup to 100.
* | Fix handling of 0-byte files uploaded to the CP file manager.jim-p2015-12-151-2/+7
| |
* | Merge pull request #2213 from PiBa-NL/pferrormessage-22Renato Botelho2015-12-141-13/+15
|\ \
| * | fix showing when a error happens parsing pf rulesPiBa-NL2015-12-121-13/+15
| | | | | | | | | | | | | | | | | | For example a queue interface speed mismatch could go unnoticed. backport from 2.3 of #2165
* | | Fix typo, gateway entry in config has a field called monitor, not monitoripRenato Botelho2015-12-112-5/+5
|/ /
* | Merge pull request #2162 from phil-davis/patch-1Renato Botelho2015-12-071-11/+3
|\ \
| * | Fix duplicate syslog messages - Redmine #5606 for RELENG_2_2Phil Davis2015-12-061-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | The generated syslog.conf needs to have the system.log selections combined into a single line in 2 places. The OP on redmine 5606 just showed 1 place in the diff there. On my system, this gets rid of the duplicated message on login: php-fpm[11074]: /index.php: Successful login for user 'my.name' from: 10.11.12.13 Note: for some reason old line 848 includes local4.none - but local4.none does not appear in old line 864. What is that about? Is that another different bug? I did not mess with that, but I noticed that the OPs diff listing did also add in local4.none where it seems to be missing.
* | | Merge pull request #2166 from phil-davis/pkgsync22Renato Botelho2015-12-073-2/+8
|\ \ \ | |/ / |/| |
| * | Redmine #4279 Package reinstall displayed when shutting down before upgradePhil Davis2015-12-073-2/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | Use a different flag file to indicate that a package reinstall is required after a reboot is done first. This avoids the possibility that the user navigates in the webGUI during the time while the shutdown is in progress and is accidentally presented with the reinstall all packages GUI button. Early in rc.bootup switch the flag file to use its ordinary name, so that all subsequent code in boot scripts and webGUI will work as it already does to handle the package reinstall and notifying the user that a package reinstall is about to be done or in progress...
* | Include ipsec.inc here otherwise the global is undefined when called when ↵jim-p2015-12-041-0/+1
| | | | | | | | restoring a config in the GUI.
* | Address a potential LFI in pkg.php and wizard.php without breaking the ↵jim-p2015-12-042-4/+18
| | | | | | | | | | | | ability to pass relative paths Restricts them to files under their intended base directories.
* | Remove txtsupport from Unbound. Of limited use, and the back end code was ↵Chris Buechler2015-12-031-17/+1
| | | | | | | | never ported over from the package (and is messy to do so). Ticket #5545
* | Sanitize the session_id/logout_id in captive portal.Chris Buechler2015-12-022-1/+4
| |
* | Merge pull request #2108 from phil-davis/patch-3Renato Botelho2015-11-231-1/+1
|\ \
| * | Backport #5512 RADIUS secretPhil Davis2015-11-231-1/+1
|/ / | | | | Another little easy thing to backport just in case.
* | Merge pull request #2014 from phil-davis/patch-1Renato Botelho2015-11-191-2/+2
|\ \
| * | Fix firewall log dynamic rule lookupPhil Davis2015-11-021-2/+2
| | | | | | | | | for rows that are dynamically added as time goes by.
* | | Merge pull request #2069 from jean-m-cyr/RELENG_2_2Renato Botelho2015-11-191-0/+4
|\ \ \
| * | | Add missing stratum parameterJean Cyr2015-11-151-0/+4
| | |/ | |/| | | | | | | | | | Add missing stratum parameter in ntpd.conf when specified on Serial GPS page.
* | | Merge pull request #2049 from phil-davis/patch-4Renato Botelho2015-11-191-1/+1
|\ \ \
| * | | Unbound advanced Invoming TCP Buffers validationPhil Davis2015-11-101-1/+1
| | | | | | | | | | | | | | | | There is a variable cut-paste error here. Actually it never makes any difference in practice because outgoing_num_tcp and incoming_num_tcp are both set, so the logic comes out the same. I noticed this while reviewing stuff in master for 2.3-ALPHA - might as well back-port stuff like this so that nobody who notices will worry about it in RELENG_2_2.
* | | | Merge pull request #2064 from phil-davis/patch-3Renato Botelho2015-11-191-1/+1
|\ \ \ \
| * | | | Ticket #5451 for RELENG_2_2Phil Davis2015-11-151-1/+1
| | |/ / | |/| | | | | | | | | | | | | | Actually this can be fixed by adding just a space after "from any". The code here builds up $tmprule and each time it adds a new clause it puts a space at the end, ready for if there is another clause to come. The "from any" here was the only offender in this scheme. It seems good to me to still backport little easy fixes to RELENG_2_2. That way production users can get them easily if they like (with system patches or...).
* | | | Merge pull request #2083 from phil-davis/patch-10Renato Botelho2015-11-191-1/+1
|\ \ \ \
| * | | | Make block bogon rule display consistent - RELENG_2_2Phil Davis2015-11-181-1/+1
| |/ / / | | | | | | | | | | | | The block private networks and anti-lockout rules display in the firewall rules display with the schedule column blank. But the block bogon networks has an asterisk. That looks odd. I noticed it just now when looking at firewall rules in 2.3. Might as well fix it here in RELENG_2_2.
* | | | Merge pull request #2082 from phil-davis/patch-9Renato Botelho2015-11-191-1/+1
|\ \ \ \
| * | | | Backport fix #5467 to RELENG_2_2Phil Davis2015-11-181-1/+1
| |/ / /
* | | | Merge pull request #2065 from phil-davis/patch-6Renato Botelho2015-11-191-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Backport Redmine #5440 to RELENG_2_2Phil Davis2015-11-151-0/+8
|/ / / | | | | | | | | | The code in RELENG_2_2 for system_usermanager_settings.php seems to work OK in RELENG_2_2 so I did not touch anything there. But diag_authentication.php had nothing about $pconfig on initial page load. This extra code makes it select a reasonable default auth server when the page first loads. After that, each time the user does "Test", the page comes back with the previously selected auth server, user name and password (like it did already) - so that seems good.
* | | diag_ipsec.php - show button for child SAs only when some are established. ↵Matt Smith2015-11-101-2/+2
|/ / | | | | | | Fix ID used by child SA disconnect button.
* | Fix syntaxRenato Botelho2015-11-091-2/+2
| |
* | Let the code ready for strongswan 5.3.4, where key used to track nat were ↵Renato Botelho2015-11-091-2/+14
| | | | | | | | committed with a different name
* | Change version to 2.2.6-DEVELOPMENTRenato Botelho2015-11-061-1/+1
| |
* | A new fix for #4130:RELENG_2_2_5Renato Botelho2015-11-031-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | The fix added for this bug, that check xml file size is < 200 to decide if file must or not be read created a new issue, single entry is not showed. Instead of doing this, check parse_xml_config() return and return empty array when it's -1 While here, prevent errors saying parse_xml_config() doesn't exist and make sure xmlparse.inc is required
* | Only call pfSense_ipsec_list_sa() when IPsec is enabledRenato Botelho2015-11-033-2/+15
| |
OpenPOWER on IntegriCloud