summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* change the location of jquery-ui images in each theme's css fileJared Dillard2015-03-189-144/+144
|
* Merge pull request #1571 from phil-davis/patch-2Renato Botelho2015-03-181-2/+2
|\
| * Cleanup code path when adding a new userPhil Davis2015-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 1) Only attempt to delete the oldusername if it actually was non-empty - at the moment errors are logged in the system log when adding a new user, because the code was trying to delete the user name "". 2) Call local_user_set() first to create (change, whatever) the user record. This makes the user record exist for a new user. Then call local_user_set_groups() to sort out what groups the user should be in or not in. The existing code would fail to add a new user to the specified group/s because local_user_set_groups() was called too early, before the user actually existed. Typical system log errors from the old code: Mar 18 17:10:31 php-fpm[9542]: /system_usermanager.php: Tried to remove user but got user pw instead. Bailing. Mar 18 17:10:31 php-fpm[9542]: /system_usermanager.php: The command '/usr/sbin/pw groupmod admins -g 1999 -M '0,2003,2006,2008' 2>&1' returned exit code '67', the output was 'pw: user `2008' does not exist' From looking at the code history, I think this has been this way for a long time, not a new bug at all. Discussed in forum: https://forum.pfsense.org/index.php?topic=90700.msg501766#msg501766
* | Merge pull request #1569 from phil-davis/patch-1Renato Botelho2015-03-181-1/+1
|\ \ | |/ |/|
| * Do not allow VLAN tag zeroPhil Davis2015-03-161-1/+1
|/ | | | At the moment you can make a VLAN with tag 0. The input validation does not catch it because when $_POST['tag'] = "0" that evaluates to false by PHP. Always make the checks on 'tag' value whenever the 'tag' key is set at all. If the (required) 'tag' key is not set, then that is already checked for by do_input_validation().
* Merge pull request #1564 from phil-davis/patch-2Renato Botelho2015-03-161-6/+6
|\
| * Use subnet address in OPT net rulesPhil Davis2015-03-141-6/+6
| | | | | | | | | | | | | | | | Example: LAN IP 10.0.1.1/24 OPT1 IP 10.0.2.1/24 Rules with SRC or DST LANnet correctly have 10.0.0.0/24 (the subnet base address) in /tmp/rules.debug Rules with SRC or DST OPT1net have 10.0.2.1/24 (the OPT1 IP address with OPT1 net mask) in /tmp/rules.debug It still works (I think) because actually 10.0.2.1/24 and 10.0.2.0/24 interpreted as a subnet still describes the same set of IP addresses, but it looks odd, as reported by: https://forum.pfsense.org/index.php?topic=90096.msg498474#msg498474 Same issue with IPv6 for OPT1net rules. This fixes the rule generation to that OPT1net uses the base subnet address in the rule, in the same way that LANnet and WANnet does.
* | Merge pull request #1562 from phil-davis/usr-review1Renato Botelho2015-03-1621-339/+402
|\ \
| * | Code Style sbin tmp usrPhil Davis2015-03-1321-339/+402
| |/ | | | | | | Bits and pieces from sbin tmp and usr but not yet usr/local/www
* | Merge pull request #1561 from phil-davis/patch-1Renato Botelho2015-03-161-1/+1
|\ \
| * | pfSsh.php readline function return valuePhil Davis2015-03-131-1/+1
| |/ | | | | This just looks wrong. But I guess the code path never comes through here because function readline() already exists in the environment of this script.
* | Merge pull request #1560 from phil-davis/get_possible_traffic_source_addressesRenato Botelho2015-03-161-4/+2
|\ \ | |/ |/|
| * Update get_possible_traffic_source_addresses returned array formatPhil Davis2015-03-131-4/+2
|/ | | | | | | | | | With this change it looks to me like the way it is intended to be, based on what was done to get_possible_listen_ips() Please review and check if this is what was intended for the code. With this change it should make the returned $sourceips array be in a consistent format the same way as get_possible_listen_ips() This is a fix for code that was only committed in master. So at this time the fix is only needed in master.
* txpower was disabled for good reason it would appear, it triggers syntax ↵Chris Buechler2015-03-132-2/+6
| | | | errors in some configurations. Disable it again since it's been disabled for years, and comment out the user-facing config portion for now since it doesn't do anything. Ticket #4516
* Apply WME input validation to all modes, not just hostap. Ticket #4516Chris Buechler2015-03-131-5/+5
|
* Default to 11ng if an option hasn't been configured. Previously we let the ↵Chris Buechler2015-03-131-1/+7
| | | | browser pick the first in the list (the first the card reported as available), which ended up being 802.11b. Ticket #4516
* Default to WPA2, AES for new wireless interface configs. Ticket #4516Chris Buechler2015-03-131-2/+2
|
* Auto-size the interface box on the bridge edit page.Chris Buechler2015-03-131-1/+2
|
* touch up interfaces.php textChris Buechler2015-03-137-10/+10
|
* Require WPA PSK where WPA-PSK is enabled. Clean up some other text. Ticket #4516Chris Buechler2015-03-127-10/+15
|
* clean up input errors textChris Buechler2015-03-127-9/+9
|
* correct missing == in ipsec.incChris Buechler2015-03-121-1/+1
|
* Merge pull request #1557 from phil-davis/patch-3Chris Buechler2015-03-121-1/+1
|\
| * Missin double equals in captiveportal.incPhil Davis2015-03-131-1/+1
| | | | | | Looking at where this is nested inside various if statements, I do not think this error did too much harm - only to the $mac['descr'] - in this particular code flow $username is not used for important stuff after this point.
* | Fix up text, remove "only for Atheros" since the option is only shown if a ↵Chris Buechler2015-03-127-5/+5
| | | | | | | | compatible card exists.
* | "Auto" channel with hostap doesn't work correctly at the moment, force ↵Chris Buechler2015-03-121-0/+4
| | | | | | | | choosing a specific channel with hostap mode for now.
* | Set txpower since that seems to work fine now. Explicitly set authmode wpa ↵Chris Buechler2015-03-121-2/+5
|/ | | | | | | here, though it's also handled by the supplicant/authenticator. Ticket #4516 Conflicts: etc/inc/interfaces.inc
* Do not start filterdns during boot until a proper fix is done. Ticket #4296Renato Botelho2015-03-122-17/+21
|
* add more wireless validation. Ticket #4516Chris Buechler2015-03-121-1/+4
|
* Add more validation for wireless config settings. Ticket #4516Chris Buechler2015-03-121-0/+22
|
* Add more input validation for wireless parameters. Ticket #4516Chris Buechler2015-03-121-0/+36
|
* Touch up wifi textChris Buechler2015-03-127-12/+12
|
* If we bail not being able to find the P1 source, log an error.Chris Buechler2015-03-121-0/+1
| | | | | Conflicts: etc/inc/vpn.inc
* Merge pull request #1556 from phil-davis/patch-5Chris Buechler2015-03-121-10/+10
|\
| * White space in ipsec.incPhil Davis2015-03-121-10/+10
| |
* | Merge pull request #1554 from phil-davis/patch-3Chris Buechler2015-03-121-45/+45
|\ \ | |/ |/|
| * White space in filter.incPhil Davis2015-03-121-45/+45
| |
* | use-compression is no longer a valid config option in lighttpd, it can't be ↵Chris Buechler2015-03-121-3/+0
| | | | | | | | enabled. This just throws an error in the log, remove it.
* | Fix IPsec on CARP IPs, broken when fixing IPsec with gateway groups and VIPs.Chris Buechler2015-03-121-5/+9
| |
* | clean up unique IDs text a bit.Chris Buechler2015-03-111-2/+2
| |
* | Move libstrongswan-unity.so when Unity plugin is disabled so it can't modify ↵Chris Buechler2015-03-111-0/+9
|/ | | | the P2. Workaround for Ticket #4178
* Proper fix #4443, do not unset carp entry when content differ, also set ↵Renato Botelho2015-03-111-2/+1
| | | | correct real interface and use subnet to check IP protocol
* Detect when broken rc.firmware is running, fix it and restart. This should ↵Renato Botelho2015-03-111-0/+21
| | | | fix #4328
* Remove -U from mtree call used to restore files permissions, this is ↵Renato Botelho2015-03-111-1/+1
| | | | replacing symlink targets by the old values. Ticket #4328
* Merge pull request #1547 from phil-davis/Code-Style-etc-inc-vwx3Renato Botelho2015-03-110-0/+0
|\
| * Merge branch 'master' into Code-Style-etc-inc-vwx3Phil Davis2015-03-1125-69/+111
| |\ | | | | | | | | | | | | Conflicts: etc/inc/vpn.inc
| * | Code style etc inc vwx3Phil Davis2015-03-098-808/+1020
| | | | | | | | | | | | | | | rebased version with conflicts resolved due to a bunch of recent changes in vpn.inc
* | | Save vip interface and subnet to use to delete old vips from secondary ↵Renato Botelho2015-03-111-9/+14
| | | | | | | | | | | | nodes. Fixes #4446
* | | Revert "Use a consistent variable name here. related to Ticket #4446"Renato Botelho2015-03-111-6/+2
| | | | | | | | | | | | This reverts commit 309162b96d6ad0db09c132cc0aabc890bfe1909f.
* | | add granular control of state timeouts. Ticket #4509Chris Buechler2015-03-112-2/+244
| | | | | | | | | | | | | | | Conflicts: etc/inc/filter.inc
OpenPOWER on IntegriCloud