Renato Botelho
e1ef1ff5ce
Merge pull request #1986 from phil-davis/patch-6
2015-10-26 07:38:19 -02:00
Renato Botelho
2167f9a4fd
Merge pull request #1984 from phil-davis/patch-4
2015-10-26 07:35:07 -02:00
Chris Buechler
5d6dde8af7
Use 1-6 rather than 0-5 for IPsec logging levels, to stay away from complications of 0 due to PHP stupidity. Upgrade config to add 1 to any configured log levels. Default to 1 as log level where none is configured by the user. Ticket #5340
2015-10-26 00:23:37 -05:00
Phil Davis
7e630279a2
Fix Command Prompt Download and Upload when not in English - Redmine #5343 for RELENG_2_2
2015-10-25 11:12:05 +05:45
Phil Davis
139cc9df98
Fix multi-lingual save of NAT mode Redmine # for RELENG_2_2
...
and forum https://forum.pfsense.org/index.php?topic=101276.0
2015-10-25 08:12:51 +05:45
Chris Buechler
add49a3a21
IKE auto mode is back, remove this config upgrade code unsetting it.
2015-10-24 01:46:01 -05:00
Renato Botelho
46bab0242a
Merge pull request #1979 from phil-davis/patch-5
2015-10-23 15:53:48 -02:00
Phil Davis
f860af1edf
interfaces_assign tab_array numbering
...
This was fixed in master for 2.3 by 50e6c063e6 - in master all of these $tab_array entries, in each file that they appear in, had been modified to just use the $tab_array[] = form.
But in RELENG_2_2 that has not happened. So it seems nicer to just fix the numbering here to match what is already in the other interfaces_*.php files in RELENG_2_2.
Note that the code works OK without this "fix" - display_top_tabs() just loops through the existing array keys anyhow and so did not notice the missing number.
2015-10-23 18:24:45 +05:45
Chris Buechler
d7f5b68ab3
Check unbound root.key file contents, and remove it if invalid, before unbound-anchor runs otherwise it will fail and unbound will fail to start. fsync the file after writing to prevent the problem. Ticket #5334
2015-10-21 19:54:10 -05:00
Matt Smith
f3ee8205e6
Make setting charon.plugins.attr.subnet conditional on net_list being set. Set
...
it's value to list of subnets configured as P2's for mobile IPsec. Fixes #5327 .
2015-10-21 08:34:47 -05:00
Chris Buechler
1eac7c1e3c
Merge pull request #1971 from doktornotor/patch-5
2015-10-20 20:16:30 -05:00
Chris Buechler
cce44072c4
Disable strongswan logging under auth since it's all logged under daemon,
...
so nothing is duplicated. Ticket #5242
2015-10-20 16:08:11 -05:00
Chris Buechler
4f1bf9029c
Check whether the P2 or its associated P1 are disabled before adding NAT
...
rules. Ticket #5320
2015-10-20 12:56:07 -05:00
Matt Smith
ca35be37bf
Limit the auth methods where "My Certificate Authority" is displayed/saved for
...
mobile clients. Fixes #5323 .
2015-10-20 12:09:09 -05:00
doktornotor
92abb65b92
Point people to 'Clear Package Lock' if the reinstall of packages got stuck (RELENG_2_2)
2015-10-20 13:12:52 +02:00
doktornotor
0246e7a2db
Point people to 'Clear Package Lock' if the reinstall of packages got stuck (RELENG_2_2)
2015-10-20 12:31:45 +02:00
Luiz Otavio O Souza
d1e172a96b
Disable zero copy buffers in bpf.
...
This was a no-op before my changes (so this was never really enabled) and
now it is known to cause issues with tcpdump and hostapd.
Disable this until we fix all the raised issues.
Issue: #5257
2015-10-19 16:41:27 -05:00
Matt Smith
0e8674d0db
Validate that the Mobile Client settings have a valid RADIUS server selected
...
as the source for user authentication when EAP-RADIUS is selected as the phase
1 authentication method for mobile IPsec. Fixes #5219 .
2015-10-19 11:23:17 -05:00
Luiz Otavio O Souza
28c54319ca
Cherry-pick 98bf4991dc:
...
Fixes #4150 . Move to tables to accomodate unlimited number of interfaces.
Cherry-pick 52fe0465b463dd8b8f4b2099d562254da320e704:
Fix the captive portal rules after 98bf4991dc .
The malformed rules breaks the parsing of initialisation rules.
Issue: #4746
2015-10-19 10:06:07 -05:00
Matt Smith
c9c3104700
Add 'caref' attribute to the ca object passed into ca_inter_create so a
...
relationship to the signing CA can be maintained. Fixes #5313 .
2015-10-16 08:54:10 -05:00
Matt Smith
c345288bf1
Limit strongswan trusted CA certificates to those required for authentication of
...
the configured IPsec SA's instead of trusting all known CA's. Fixes #5243 .
2015-10-16 08:32:53 -05:00
Chris Buechler
6d134679cf
only use daemon and not auth for strongswan logging. As it was, all logs were duplicated. Ticket #5242
2015-10-15 15:19:13 -05:00
Chris Buechler
1f290d6244
fix comparison here. Ticket #4558
2015-10-15 11:54:44 -05:00
Matt Smith
cd4aa77ca3
Set rightca for IPsec phase 1 using Mutual RSA, Mutual RSA + xauth, or EAP-TLS. Fixes #5241 .
2015-10-15 10:32:29 -05:00
Renato Botelho
b7e3ab94e2
s/ip/IP/ it got lost on revert. Spotted by @phil-davis
2015-10-14 09:36:47 -03:00
Chris Buechler
71afb77560
This is necessary for dhcrelay to function. Revert "remove the destination server's interface(s) from dhcrelay"
...
This reverts commit 97613114b5 .
2015-10-14 02:06:32 -05:00
Chris Buechler
5944736981
Auto-add firewall rules for DHCP Relay, same as is done for DHCP Server. Add filter reload to DHCP Relay config so rules are immediately added/removed. Ticket #4558
2015-10-14 01:25:22 -05:00
Chris Buechler
6f4c051cb8
Remove original rightsourceip. Ticket #5284
2015-10-13 21:38:17 -05:00
Chris Buechler
0d54d26194
set enabled/disabled status accordingly on initial page load. Ticket #5284
2015-10-13 21:33:54 -05:00
Chris Buechler
14a9f7b6f5
clean up empty lines
2015-10-13 17:54:18 -05:00
Chris Buechler
8d84b036c6
Add all remaining log types to status.php. Ticket #5304
2015-10-13 17:49:50 -05:00
Renato Botelho
176fee0d31
PHP chmod() doesn't like 1777, gives it 01777 then
2015-10-13 12:08:43 -03:00
Renato Botelho
18be8e81d1
Add missing ; and also mute chmod
2015-10-13 12:02:34 -03:00
Renato Botelho
8aec82088c
Preserve /tmp permission, it fixes #5298
2015-10-13 11:34:23 -03:00
Renato Botelho
8832202d54
Update zoneinfo to 2015f, it fixes #5254
2015-10-13 10:06:35 -03:00
Chris Buechler
f248cdc0fe
Remove strongswan's cert directories and repopulate them, to ensure no removed CAs, certs, or CRLs remain. Ticket #5238
2015-10-12 22:03:59 -05:00
Chris Buechler
54a5275743
Fix up strongswan logging levels. Remove charondebug since strongswan.conf settings take precedence. Set logging levels in strongswan.conf to match what's set on a running system via 'ipsec stroke loglevel', and remove log levels that were hard coded in strongswan.conf. Ticket #5242
2015-10-12 21:42:02 -05:00
Chris Buechler
94b89bdf07
Merge pull request #1962 from davidjwood/RELENG_2_2-ppp-ipv6
2015-10-12 19:10:32 -05:00
Renato Botelho
d7e5efa461
Merge pull request #1958 from phil-davis/patch-11
2015-10-12 12:29:26 -03:00
Renato Botelho
8d070c072e
Merge pull request #1957 from phil-davis/patch-10
2015-10-12 12:13:16 -03:00
David Wood
a7cc117f3e
Use named variables for ppp-linkup command line parameters
2015-10-11 17:49:15 +01:00
David Wood
0c54b7567b
Make route deletions quiet - it may well be the routes have already disappeared
2015-10-11 17:42:14 +01:00
David Wood
f190f1a079
Make code dealing with the IPv4 default gateway conditional on the IPv4 link going down
2015-10-11 17:39:37 +01:00
David Wood
37803aa5ba
Connect ppp-ipv6 helper script to ppp-linkdown and ppp-linkup
2015-10-11 17:23:04 +01:00
David Wood
c348524564
Add /usr/local/sbin/ppp-ipv6 helper script
...
/usr/local/sbin/ppp-ipv6 <real interface> up|down
Interface using SLAAC or DHCP6 going down:
* bring down dhcp6c if it is running
* disable router advertisements (and therefore SLAAC)
* remove any autoconfigured IPv6 addresses
Interface using SLAAC or DHCP6 coming up:
* call interface_dhcpv6_configure() if dhcp6c not running and router advertisements off
interface_dhcpv6_configure() will enable router advertisements,
configure rtsold and dhcp6c, then set rtsold to prime dhcp6c as
required.
2015-10-11 17:05:40 +01:00
Phil Davis
d5161e8e05
Redmine #5294 Do not delete a system group
...
This code checks if the user has somehow posted a group deletion for a group that has "system" scope. If so, then the delete is not done and an input error is displayed.
Note that in normal use the group manager page does not display a delete button for "system" groups, so normally this does not happen - only if the user manually messes with the $POST variables.
2015-10-11 14:28:36 +05:45
Phil Davis
eef67fd5ef
Redmine #5294 Do not delete a system user
...
This code checks if the user has somehow posted a user deletion for a user that has "system" scope. If so, then the delete iscnot done and an input error is displayed.
Note that in normal use the user manager page does not display a delete button for "system" users, so normally this does not happen - only if the user manually messes with the $POST variables.
2015-10-11 14:02:18 +05:45
Renato Botelho
53a2156519
Merge pull request #1954 from doktornotor/patch-2
2015-10-09 10:42:45 -03:00
doktornotor
1bdbada63d
Add SVG MIME type - RELENG_2_2
...
Because it breaks traffic graphs for people.https://forum.pfsense.org/index.php?topic=87390.0
2015-10-09 10:25:25 +02:00
Chris Buechler
5d0fd04e25
Do curl_init above any curl_setopt, and take it out of that if block since it applies to all types.
2015-10-08 22:36:16 -05:00