Commit Graph

23140 Commits

Author SHA1 Message Date
Ermal
2154560df2 Unset these globals after use 2014-04-14 12:32:55 +00:00
Ermal
b0de439983 Merge pull request #1087 from phil-davis/patch-10 2014-04-14 12:25:03 +00:00
Ermal
82f273e105 Merge pull request #1086 from phil-davis/patch-9 2014-04-14 12:24:09 +00:00
Phil Davis
32751b9f1a Include static routes in automatic NAT rules display
If I have an internal gateway to other private subnets behind LAN, and add a static route to those private subnets through the internal gateway, then pfSense very nicely generates NAT rules on WAN-style interfaces to NAT those internal subnets on the way out of WAN. That is very good and convenient. This outbound NAT is actually correctly in the ruleset.
However, the new Outbound NAT GUI page shows the Automatic Outbound NAT rules that are in effect (a great new feature in 2.2). But it did not show the rules for the static routes.
This fixes it. (But the code for all of this is a bit ugly, because it all depends on having a global variable $GatewaysList in view - I am not going to attempt to re-engineer that)
2014-04-14 04:37:46 -07:00
Phil Davis
ee34e13739 Do not allow upgrade_101_to_102 to exit early
This upgrade step does both Captive Portal stuff and OpenVPN stuff. So do not return early just because there is no Captive Portal config.
Both Captive Portal and OpenVPN tests changed to be positive tests, to make sure that everything is checked/tested and there is no chance to return early.
2014-04-14 04:23:18 -07:00
PiBa-NL
146ee078fe console, reload firewall rules after enabling SSH 2014-04-14 10:33:38 +00:00
Renato Botelho
b4e0a62a0a Merge pull request #1076 from phil-davis/patch-2 2014-04-14 07:28:29 -03:00
Phil Davis
c30639e445 Get real interface when dhcrelay uses default GW
If the DHCP Relay server is not on any local subnet, and not on any subnet that has an internal static route, but is somewhere that no specific route is known, then this code finds the default gateway and uses that in the DHCP relay "-i" parameter. The current code gets just the interface name (like "wan", "opt1"). But DHCP Relay command needs to be fed the actual device name "vr0", "vr1" etc.
To break this I simply enabled DHCP Relay, select "LAN" interface, and put Destination Server 1.2.3.4
Making this changed fixed it.
Forum: https://forum.pfsense.org/index.php?topic=75010.0
2014-04-14 10:27:22 +00:00
Ermal
33f537179b Merge pull request #1072 from marcelloc/patch-3 2014-04-14 10:19:16 +00:00
Renato Botelho
d87ec8f909 Merge pull request #1071 from ExolonDX/master 2014-04-14 06:54:52 -03:00
Chris Buechler
d471a8901f tls-verify requires quotes around the command to be executed. Ticket #3596 2014-04-14 06:35:57 -03:00
Chris Buechler
84fc1d4daa use email from CA creation also as the default for server cert 2014-04-14 06:35:44 -03:00
Ermal
23cb5252d7 There is no need to make distinction in kernel anymore since they are the same nowdays and it does the right thing(tm) most of the time 2014-04-14 08:13:37 +00:00
Ermal
f03ed3505d Nowdays there is no real difference between the kernels apart the ZFS support. So do not keep a distinction anymore 2014-04-14 08:09:19 +00:00
m0se
bb8f3ce115 fixing typo for GIF tunnels to work over IPv6
the call of get_interface_gatewayv6() in the creation of a GIF tunnel over IPv6 leads to a "Fatal error: Call to undefined function get_interface_gatewayv6() in /etc/inc/interfaces.inc on line 934". changeing the function call to get_interface_gateway_v6() fixed it for me on my local system.
2014-04-12 16:29:43 +00:00
Ermal
faf20ee4a7 Also add similar checks on rc.newwanipv6 as in the v4 version 2014-04-12 11:28:43 +00:00
Ermal
83c0dc1d1e Forgot to remove the problematic part from previous OpenVPN loop fix commit 2014-04-12 11:24:43 +00:00
Phil Davis
ffb76388c9 Tidy up package signature text
Thought I would tidy this up while coming across it. IMHO "Package settings" reads better than "Packages settings"... and I reworded the explanatory text a bit also.
2014-04-12 04:03:37 -07:00
Ermal
91571af53a Take care of the loops reported for OpenVPN in tap mode. Also fixes the problems of tap disappearing from bridge if its a member. 2014-04-12 06:21:12 +00:00
Chris Buechler
db45bc6892 tls-verify requires quotes around the command to be executed. Ticket #3596 2014-04-11 19:33:42 -05:00
Chris Buechler
e8e283669a use email from CA creation also as the default for server cert 2014-04-11 19:31:46 -05:00
Renato Botelho
d6fa556643 Add curly brackets here to improve readability 2014-04-10 17:50:36 -03:00
Renato Botelho
43f661f773 unset doesn't like @ to silent it, just check if it's set before unset 2014-04-10 17:49:22 -03:00
Marcello Coutinho
da1d016527 fix git path calls and CODIR
it may need some checks/fixes on pkg-utils.inc as git downloads but not installs.

After manual pbi install of git, "pfSsh.php playback gitsync master" works fine with this fix.
2014-04-09 17:53:13 -03:00
jim-p
80f4885030 Use an alphanumeric test rather than purely is_numericint because the ID is generated by uniqid and is not purely numeric. Fixes #3591 2014-04-09 08:52:25 -04:00
Renato Botelho
6e767d170c Restore old logic and add a @ at unset to silent when it is not set as suggested by Ermal 2014-04-08 12:47:08 -03:00
Colin Fleming
3f08e7ab59 Tidy up "guiconfig.inc" XHTML
Add missing closing SELECT tag
2014-04-08 13:43:08 +01:00
Renato Botelho
df0b05a3b8 Merge pull request #1068 from FCI/patch-1 2014-04-08 09:12:22 -03:00
Ermal
1d0cacfee5 Check if the ipsec section exists before doing operations on it. 2014-04-07 17:38:47 +00:00
Ermal
ca321bfde9 Correct typo on function name that has slipped unnoticed. Reported-by: https://forum.pfsense.org/index.php?topic=74688.0 2014-04-07 15:30:19 +00:00
Marcello Coutinho
2c0dd2639d fixes Bug #3569
On packages that uses row_helper when user clicks on add or delete button, the page scrolls to top.
It seems something with ajax
http://stackoverflow.com/questions/1061580/jquery-click-on-anchor-element-forces-scroll-to-top

A simple return false after jquery action fixes the unwanted scroll.
2014-04-07 11:49:49 -03:00
Renato Botelho
539d94b31b Merge pull request #1055 from ExolonDX/branch_master_10 2014-04-07 11:43:57 -03:00
jim-p
69e593c14f Make extra sure that we do not start multiple instances of dhcpleases if, for example, the PID is stale/invalid and there is still a running instance. 2014-04-07 10:10:48 -04:00
Renato Botelho
1bf572ec0e Merge pull request #1056 from ExolonDX/branch_master_12 2014-04-07 09:18:04 -03:00
Renato Botelho
ec307f4dec Merge pull request #1057 from ExolonDX/branch_master_13 2014-04-07 09:17:52 -03:00
Renato Botelho
dc11a7dd1b Merge pull request #1058 from ExolonDX/branch_master_14 2014-04-07 09:17:25 -03:00
Renato Botelho
0031e4da6a Merge pull request #1059 from ExolonDX/branch_master_15 2014-04-07 09:17:11 -03:00
Renato Botelho
ee5c8e0b01 Merge pull request #1060 from ExolonDX/branch_master_16 2014-04-07 09:16:38 -03:00
Renato Botelho
8c771b1998 Merge pull request #1061 from ExolonDX/branch_master_17 2014-04-07 09:16:04 -03:00
Renato Botelho
c3288e0c78 Merge pull request #1062 from ExolonDX/branch_master_18 2014-04-07 09:15:29 -03:00
Renato Botelho
f5961e7bb1 Merge pull request #1063 from ExolonDX/branch_master_19 2014-04-07 08:40:10 -03:00
Renato Botelho
29773e5ca4 Merge pull request #1065 from ExolonDX/branch_master_22 2014-04-07 07:55:21 -03:00
Ermal
a7ee038bce Put the fix to be more generic to prevent any other leak possible in the long run. Fixes #3062 2014-04-07 09:06:04 +00:00
dsiunicaen
39f3d843dc Update captiveportal.inc
Release unused pipeno when client is already authenticated.

Bug #3062
2014-04-07 09:01:54 +00:00
Warren Baker
bb7843fd20 Indentation 2014-04-07 10:10:04 +02:00
Warren Baker
2a2b603d0c Indentation 2014-04-07 10:09:48 +02:00
Warren Baker
c2fe67ebe0 Dont check for 'checked' but rather if it is just set 2014-04-07 10:09:15 +02:00
Warren Baker
d269747b35 Ensure variable is available when testing smtp. Fixes #3577 (well not the rrd summary package). 2014-04-06 18:51:11 +02:00
Nick Daniels
2a230e80e5 Update system_advanced_misc.php 2014-04-05 19:57:52 +01:00
Nick Daniels
5a9dd268c6 Added check line 175: Needed to fix error in GUI
Added check to see if $config['ipsec']["ipsec_{$lkey}"] is set before executing unnecessary unset, was causing issues when trying to enable/disable ("Do NOT check packages signature")
2014-04-05 19:49:12 +01:00