Commit Graph

25151 Commits

Author SHA1 Message Date
Phil Davis
5402c8fcde Fix startingat var name typo in pkp.php
Even with this fix, the code does not make sense. The first test is:
if ($startingat > -1)

if it gets into the else, then $startingat must be negative. But the test in the "else" tests for >1 ???

Someone who knows what it really is supposed to do could fix it!
2015-05-15 07:42:31 -03:00
Chris Buechler
af6649969b Remove the "insert my MAC" feature from interfaces.php. It hasn't worked in a while (credit sbeaver for noticing), and the only thing it tends to accomplish is breaking people's connectivity from the system where they end up duplicating the MAC of their local system.
Conflicts:
	usr/local/www/interfaces.php
2015-05-14 17:32:24 -05:00
Ermal LUÇI
380ae02017 Add some error checking to avoid warning during boot 2015-05-14 21:03:10 +02:00
Phil Davis
448161bac8 Add some curlies in status_rrd_graph_img
These "if data" tests look like they should apply to all 4 lines below them.
After sorting out this real-looking issue, I can mess with the rest of the formatting...
2015-05-14 08:53:17 -03:00
Phil Davis
db7d66e777 Cleanup code logic status_upnp
1) Variable $i is was set, incremented and not used.
2) "if preg_match" at line 94 had no curlies after it, so it was only applying to the first line after it ($rdr_proto = ...) It really looks like "if preg_match"should apply to the whole code chunk - settings the various "rdr*" vars and then spitting out the "tr" with the various matches values in the row.
Somebody with some various UPnP enabled and running should test this to see if the status page still works with this change.
I think it only makes a difference if $rdr_entries has some lines in it that do not match the regex - in that case the old code might have displayed some rubbish or (almost?) duplicated rows.
2015-05-14 08:50:54 -03:00
Phil Davis
34f3165b54 Fix alias rename and delete bug #4701
The old advancedoutbound key in config.xml is now called outbound.
2015-05-14 08:44:55 -03:00
Phil Davis
caa7230e69 Slash-select should be inside if in load_balancer_pool_edit
otherwise there is an unbalanced slash-select when the else happens (if there are no load-balancer monitors defined)
2015-05-13 14:12:08 -03:00
Berger Alexander
7bf0ce52d9 fixed indent according to the style guide. 2015-05-11 11:36:21 -03:00
Berger Alexander
3274927527 Currently pfsense enforces unique unqualified hostnames for static dhcp leases, which is not correct as only the fully qualified hostname (hostname + domainname) must be unique. With this commit the old validation logic for uniqeness is modified such that hostnames no longer need to be unique and at the same time the fully qualified hostname hast to be unique.
This change makes it possible to have host with identical hostnames in different (sub)domains. For example myhost.sales.acme.com and myhost.support.acme.com will now be possible.
2015-05-11 11:36:15 -03:00
Phil Davis
55395a834f Firewall Rules Edit missing slash
This should be the end of a "tr" here.
Browsers seem to be forgiving of this stuff - I don't see any difference in rendering in Firefox before or after this change.
2015-05-11 09:31:46 -03:00
Phil Davis
801cbbf7e5 Unmatched td in firewall_nat
This file seems to have an unmatched "td" ending. Adding the line here matches the "td" at line 320 and this embraces the little table that has the 4 icons in it in a square that comes at the right hand end of each port-forward entry in the main table.
I can't see any difference in the rendering of the page, at least on Firefox, with and without this fix.
The tabbing of this file is woeful. I am fixing that up with a code-style review. But thought I should do a separate pull request for this kind-of-functional fix.
2015-05-08 17:43:36 -03:00
Robert Nelson
ca9a4e2b58 Call clear_subsystem_dirty('staticmaps') if using Unbound 2015-05-08 17:43:24 -03:00
jim-p
e29271f2fb Encode server name before displaying back to the user. 2015-05-01 16:48:28 -04:00
Ermal LUÇI
3ce84694f9 Ticket #4652 actually return value as expected! 2015-05-01 22:36:44 +02:00
Ermal LUÇI
620c4df1bc Ticket #4235 put reply-to/route-to rules even for mobile-ipsec. 2015-05-01 21:55:56 +02:00
Ermal LUÇI
3a09e0d96e Fixes #4633 Enable carp packets to flow on the first carp interface creation. This is needed only when the system is booted up without any carp vip configured 2015-05-01 21:44:46 +02:00
Ermal LUÇI
f539af7623 Ticket #4131 before formatting the mac extract the needed statistics from below 2015-05-01 21:32:14 +02:00
Ermal LUÇI
b514030704 Ticket #4651 Oops correct name of var 2015-05-01 21:09:32 +02:00
Ermal LUÇI
be8b480ed1 Fixes #4651 Assign a proper tracker for NEGATE rules 2015-05-01 21:07:46 +02:00
Ermal LUÇI
120acbae8c Fixes #4652 put workaround for bogus timestamp until real data are cosnumed. 2015-05-01 21:01:11 +02:00
Ermal LUÇI
afd0c1f2c9 Seems strongswan 5.3.0 has improved the situation on putting multiple phase2 on IKEv1 behaviour and it behaves even better with reqid not defined in config. 2015-04-30 22:53:00 +02:00
Ermal LUÇI
1e92a236f4 Revert "Use a dirty hack to make IKEv1 with multiple phase2 to work correctly with one IKE SA for each subnet"
This reverts commit 7d5add01e4.
2015-04-30 22:50:12 +02:00
Ermal LUÇI
6bc6a72766 Revert "Provide a description for the dirty hack to not come back scratching.... on it"
This reverts commit 6d7e7c0c5c.
2015-04-30 22:50:11 +02:00
Chris Buechler
ee72e2caed Show correct selection for noshuntlan option. Ticket #4655 2015-04-30 01:23:11 -05:00
Phil Davis
cf3aff59ed Add static mapping interface not set when IP in a pool
If the DHCP IP address is in a pool (not in the main DHCP range for the interface) then the interface that corresponds to the IP address is not found. This results in the link to "add static mapping for this MAC address" not having any value for "if=" and thus clicking on the "+" button does not work.
Reported in bug 4649
Process any pools when checking for which interface contains the IP address.
2015-04-27 09:13:48 -03:00
Phil Davis
d7d6342c41 Fall back to getting local user pages and groups
if the groups could not be found from LDAP and there is a local user.
2015-04-27 09:09:40 -03:00
Phil Davis
73bbcaed4d Do not process dhcpd implementation if input errors
If I go to Service->DHCP Server, make some edits that are invalid (e.g. change range start or end to some invalid string) and press Save then the page comes back displaying the input error(s). But it also says:
"The changes have been applied successfully."
Actually, the changes (which were invalid) have not been applied to the config - all is well there - but dhcpd has been stopped and started and dnsmasq or unbound has been kicked... which is all unnecessary processing since the user has not yet provided valid values to save.
2015-04-27 09:03:32 -03:00
Colin Fleming
1fa1a40b84 Tidy up "services_unbound.php" XHTML
Add missing closing TD tag
2015-04-27 09:02:22 -03:00
Colin Fleming
9dded879f0 Tidy up "status_upnp.php" XHTML
Remove double line from table
2015-04-27 09:02:17 -03:00
jim-p
d9e5a9318c Remove the DHCP static lease overlap cleanup and associated function and kill, as it can cause problems with failover scenarios. 2015-04-24 15:56:31 -04:00
Ermal LUÇI
6d7e7c0c5c Provide a description for the dirty hack to not come back scratching.... on it 2015-04-24 17:33:18 +02:00
Ermal LUÇI
7d5add01e4 Use a dirty hack to make IKEv1 with multiple phase2 to work correctly with one IKE SA for each subnet 2015-04-24 17:30:50 +02:00
Ermal LUÇI
6ed34650a7 Is better to send the signal to starter rather than to charon directly. Starter manager charon properly. This should fix a lot of issues with configuration reloading that before sometimes did not work especially when changing phase2 entries 2015-04-24 16:54:51 +02:00
Ermal LUÇI
2334aff978 This was meant to remove duplicates here, even though charon will do by itself but better do it since it was meant to. 2015-04-23 20:16:37 +02:00
Chris Buechler
bc28e0e4b2 Trying to submit a symlink as part of crash reports will cause a failed
submission. Remove symlinks first. Also properly set user agent while
here, consistent with others. Fix some style and whitespace too. Ticket
2015-04-22 15:14:32 -05:00
Ermal LUÇI
26b94b874f Merge manually pull request #1626 to this branch 2015-04-21 19:43:20 +02:00
Ermal LUÇI
e1bcb659be s/;/:/ 2015-04-21 19:40:11 +02:00
Ermal LUÇI
7b9d7eac04 Revert "Revert "Move to specifically specifying the ID type apart when an ip address to have strongswan do proper behaviour. Also for DynDNS names use the dns type id so strongswan does the resolving by its own.""
This reverts commit 4e8eacfd7c.

Conflicts:
	etc/inc/ipsec.inc
2015-04-21 19:39:11 +02:00
Jeremy Porter
3be781e759 Add new bios product id string 2015-04-20 18:26:34 -03:00
Ermal LUÇI
a75d1a5f01 Allow to configure new modes for phase1 according to RFC 5903 by manually merging pull request #1501 partially. While here preserve style. 2015-04-20 20:54:28 +02:00
Ermal LUÇI
868a62be4c Fix #4640 IPsec Auto-exclude LAN address toggles every time save is pressed.
Actually the GUI is displaying the opposite setting to what is in the config. When the user pressed save that opposite setting was saved, but then again it displays the opposite of the opposite...
2015-04-20 20:40:06 +02:00
Ermal LUÇI
905e115668 Fixes #4625, manual merge of pull request #1617 for RELENG_2_2 branch on fixing voucher disconnection. 2015-04-20 20:37:52 +02:00
Ermal LUÇI
1d839e6da6 Implement make bofre break feature avaliable on strongswan 5.3.0 useful for IKEv2. Fixes #4626 2015-04-18 10:35:51 +02:00
Ermal LUÇI
e6130125dc Merge pull request #1619 from ibauersachs/newipsecdns-eap-radius_2-2 2015-04-17 16:35:09 +02:00
Ingo Bauersachs
0b884dd234 Make auth_get_authserver_list available to vpn.inc
This is a follow-up to PR #1613 and avoids a crash in this script at random times.
2015-04-17 10:16:09 +02:00
Ermal LUÇI
41ee551453 Fixes #4625 correct disconnection of users especially when called from xmlrpc code. 2015-04-16 20:17:18 +02:00
Ermal LUÇI
99d263f587 Merge pull request #1613 from ibauersachs/ipsec-mobile-eap-radius_2-2 2015-04-16 19:42:12 +02:00
Chris Buechler
ff3c14a510 Always do a filter reload in vpn_ipsec_configure to ensure the ruleset is
updated where necessary in every IPsec change scenario.
2015-04-16 12:34:46 -05:00
Renato Botelho
cc1f655f8e Remove boot_serial='yes' from loader.conf when serial is disabled, error introduced by me on commit 986e77a2ea 2015-04-16 12:15:05 -03:00
Phil Davis
98615a3156 Fix unbound warning when dnsallowoverride off and forwarding on
Reported in forum: https://forum.pfsense.org/index.php?topic=92437.0

The $ns array was being used further down, but if dnsallowoverride was off, the array never got created.
2015-04-16 07:32:18 -03:00