Commit Graph

25503 Commits

Author SHA1 Message Date
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
Chris Buechler
7da63a641c Merge pull request #1953 from phil-davis/patch-10 2015-10-07 21:36:56 -05:00
Chris Buechler
0aa7de0978 correct htmlentities unintentionally removed by earlier commit 2015-10-07 21:34:30 -05:00
Phil Davis
cbf81857d9 Wording of alias_info_popup tip
I noticed this while comparing alias popup behavior between 2.2.5-DEVELOPMENT and 2.3
Might as well fix the grammar here for 2.2.5
This tip does not exist in 2.3 because the popup works more nicely there and so this text is not needed.
Therefore this change does not need to be ported forward to master.
2015-10-08 07:36:50 +05:45
Matt Smith
db322752eb https://redmine.pfsense.org/issues/5207
change auth methods for both peers when using hybrid RSA + xauth with IKEv1
2015-10-07 15:28:08 -05:00
Matt Smith
5bf321b6dd Add support for an IPv6 pool for mobile clients. 2015-10-07 14:15:54 -05:00
jim-p
b07f827a90 Don't enforce the use of only IPv4 or IPv6 when using IKEv2 since it works fine with IKEv2 2015-10-07 12:14:17 -04:00
Chris Buechler
23ec30ee67 Where doing a dynamic DNS update on IPv4, force curl to resolve IPv4 IPs. Ticket #3858 2015-10-03 00:07:00 -05:00
Chris Buechler
2cf5f94a6f Fix typo 2015-10-02 01:00:17 -05:00
Chris Buechler
acdcdb2d54 Specify PSK for mobile configurations without the leading ID selectors. Fixes PSK mismatches from iOS clients. 2015-10-02 00:03:33 -05:00
jim-p
7788baf845 When using eap-radius, if the virtual address pool is left blank, pull the IP addresses from RADIUS instead. (Will need an IP address defined for each account.) Doesn't seem to be possible to pull from either RADIUS *or* a local pool that I can see from experimenting and looking at strongSwan's docs. 2015-10-01 19:54:10 -04:00
Chris Buechler
46545f30a0 Specify %any where identifier is "any", so the note on these pages
actually works.
2015-10-01 13:19:42 -05:00
Chris Buechler
8ed4a13929 Only need to check 'vip' here. 2015-09-30 20:58:38 -05:00
Chris Buechler
1dc9bd3c0c Can't use continue here as it continues the foreach, which skips the
"ipfw zone" command, breaking CP for any system that doesn't have VIPs
defined.
2015-09-30 18:11:04 -05:00
Chris Buechler
70fc7a158f Fix up IKE auto mode 2015-09-29 19:48:33 -05:00
Chris Buechler
72b4057b8d Correctly show v1/v2/auto on vpn_ipsec.php 2015-09-29 19:40:26 -05:00
Chris Buechler
d6bc309116 Bring this back, I'll fix issues afterwards. Revert "Remove "auto", it's just a synonym for IKEv2. Ticket #4873"
This reverts commit 47f802694a.
2015-09-29 19:24:20 -05:00
Chris Buechler
e0c822a1f3 Use the appropriate parent interface with gateway groups using CARP VIPs.
Ticket #4990
2015-09-29 18:57:12 -05:00
Chris Buechler
b98a584a7a Do a service reload of dyndns when changing gateways in case something has
changed. Ticket #5214
2015-09-29 17:29:41 -05:00
Chris Buechler
069df7d65d Disable DHS as a dynamic DNS provider option. It's never worked, and
fixing is more complex than just fixing the variable screw up and
disabling cert validation for their SSLLabs F-graded site. Updates made on
their site even take quite some time to be reflected, seems to be a largely
abandoned service.
2015-09-29 15:45:22 -05:00
Chris Buechler
0e512ee3a5 Use self rather than any in auto-added IPsec rules to prevent
over-matching. Ticket #5211
2015-09-28 15:37:07 -05:00
jim-p
635ee4eb05 Ensure this only contains a partial name, not a path, before attempting to craft a full name and read the file. Fixes #5203. 2015-09-28 13:46:58 -04:00
Renato Botelho
a5bf7adb7b Merge pull request #1938 from phil-davis/patch-5 2015-09-28 14:29:08 -03:00
Renato Botelho
184a499912 Merge pull request #1939 from doktornotor/patch-5 2015-09-28 10:18:22 -03:00
doktornotor
aac2557e4d Fix comment language 2015-09-28 08:42:34 +02:00
doktornotor
0c2f769c0a Remove syslog.conf entries on package uninstall (Bug #5210) - RELENG_2_2
The remove_text_from_file() is not needed at all. However, system_syslogd_start() must be run after the package entries are gone from config.xml, otherwise system_syslogd_start() just re-adds the (now almost removed) package logging configuration from there.
2015-09-27 18:35:06 +02:00
Phil Davis
c5863ca184 Redmine #5200 be less aggressive about DHCP Pool Notice V2
This one will log_error() the DHCP pool message when it detects the inconsistency at the end of the setup wizard during reload all.
That way it can still be seen in the system log that this happened, and one day someone might chase down all the steps in the "reload all" process.
Compare this with https://github.com/pfsense/pfsense/pull/1935 and choose which way you would like to go.
2015-09-26 15:23:32 +05:45
jim-p
0b74438e96 Reset the value of a package field before this test in case it has no default. Fixes #5199 2015-09-24 10:01:41 -04:00
Renato Botelho
b4e8714c60 Merge pull request #1933 from phil-davis/patch-4 2015-09-24 07:11:14 -03:00
Phil Davis
098f394329 Redmine #5196 Remove incorrect text about DNS servers - RELENG_2_2
The correct text is already displayed under the DNS server boxes at line 892.
This should also be done to master once the conversion of services_dhcp.php to bootstrap is stable.
2015-09-24 12:48:20 +05:45
Chris Buechler
2f1e2ad9c1 Use get_interface rather than find_interface here. It'll work for VIPs on gateway groups this way, and cache doesn't really matter here. Partial fix for Ticket #4990 2015-09-23 23:47:46 -05:00
Luiz Otavio O Souza
4ccf7dd97a Do not pass vouchers shorter than 5 characters to voucher application, they
are too short to be a valid voucher.

Discussed with:		Jim P
Issue:			#4985
2015-09-22 07:57:05 -05:00
Renato Botelho
c3b1d3ff57 Merge pull request #1928 from phil-davis/patch-1 2015-09-22 07:06:48 -03:00
Phil Davis
f4bd25a7c6 Redmine #4568 Preserve MLPPP settings when saving interface settings RELENG_2_2 Vagain
with errors fixed.
Supersedes https://github.com/pfsense/pfsense/pull/1781
2015-09-22 07:17:56 +05:45
Renato Botelho
c6ca12a66a Merge pull request #1790 from phil-davis/pkg-install-4884-RELENG_2_2 2015-09-21 17:11:14 -03:00
mortencombat
809ffcdbaa GratisDNS support for hosts without subdomains
Resubmit of #1793
2015-09-21 17:00:05 -03:00
TarasSavchuk
03ae5544b5 Add L2TP server's interface to mpd.conf
https://redmine.pfsense.org/issues/4830
https://forum.pfsense.org/index.php?topic=95908.0
2015-09-21 16:49:26 -03:00
Renato Botelho
6179b021f3 Merge pull request #1907 from doktornotor/patch-5 2015-09-21 16:12:33 -03:00
Renato Botelho
62f3a0ea27 Merge pull request #1916 from doktornotor/patch-15 2015-09-21 16:02:27 -03:00
Renato Botelho
adbf3f4652 Merge pull request #1807 from miken32/RELENG_2_2 2015-09-21 14:59:16 -03:00
Renato Botelho
4478765839 Merge pull request #1836 from phil-davis/patch-4 2015-09-21 14:43:23 -03:00
Renato Botelho
18f523b7ca Merge pull request #1913 from doktornotor/patch-11 2015-09-21 13:56:17 -03:00
Renato Botelho
8bce0031f8 Merge pull request #1921 from doktornotor/patch-20 2015-09-21 13:49:57 -03:00
Renato Botelho
6298f87a24 Merge pull request #1923 from phil-davis/patch-5 2015-09-21 13:39:48 -03:00
Renato Botelho
45be7ac196 Merge pull request #1926 from doktornotor/patch-23 2015-09-21 13:37:31 -03:00
doktornotor
1643073765 fix interface assignment menus running off VGA screen
Remove leftover :
2015-09-21 17:18:44 +02:00
doktornotor
2cefc6b17a fix interface assignment menus running off VGA screen 2015-09-21 16:54:41 +02:00