Commit Graph

31400 Commits

Author SHA1 Message Date
Chris Buechler
dfaaa729c3 Deprecate references to modulate state. Remove rule allowing TCP 1723 inbound when PPTP client is in use, as that's unnecessary. 2016-04-06 19:50:39 -05:00
Chris Buechler
ae366af139 Merge pull request #2849 from phil-davis/patch-4 2016-04-06 17:18:01 -05:00
Phil Davis
231197bbeb Redmine #6081 do not reuse index var
The value of $i needs to be kept constant from the outer loop - do not reuse it here.
2016-04-07 03:49:53 +05:45
Renato Botelho
5458973f9c Add fingerprint for RELEASE pkg sign key
(cherry picked from commit 2a15cab9e3)
2016-04-06 17:36:48 -03:00
Chris Buechler
06ac4c7fd0 Clarify log when skipping v6 bogons update. 2016-04-06 12:45:59 -05:00
jim-p
16897690af Fix typo 2016-04-06 09:22:49 -04:00
Renato Botelho
655f15f968 Merge pull request #2848 from phil-davis/patch-4 2016-04-06 10:14:34 -03:00
Phil Davis
0f191478ba services_ntpd_pps remove bonus f 2016-04-06 18:23:56 +05:45
Renato Botelho
43cbe85544 Use PHP cli to silence output garbage 2016-04-06 07:30:54 -03:00
Renato Botelho
751815fe82 Silence /etc/rc.notify_message garbage output
(cherry picked from commit eb3491d99e)
2016-04-06 07:29:02 -03:00
Renato Botelho
c819492263 Fix code used to read config repo path
(cherry picked from commit e429ac7134)
2016-04-06 07:21:55 -03:00
Renato Botelho
b3c75c1a4e Do all steps to replace repo package and make sure symlink is in place
(cherry picked from commit 5caee0ba0f)
2016-04-06 07:21:55 -03:00
Renato Botelho
9c34b7aef1 Make sure symlink is created on post-install
(cherry picked from commit f5edca6c48)
2016-04-06 07:21:55 -03:00
Renato Botelho
2d05e9c634 Force update after reinstall repo pkg
(cherry picked from commit 3e7c1ea74a)
2016-04-06 07:21:55 -03:00
Renato Botelho
a06305363b Merge pull request #2846 from phil-davis/patch-4 2016-04-06 07:00:59 -03:00
Renato Botelho
05bdceee8c Simplify logic 2016-04-06 06:58:03 -03:00
Renato Botelho
fa1560ec1a Make sure directory exists
(cherry picked from commit cc1b7ddd0b)
2016-04-06 06:37:29 -03:00
Phil Davis
82cde7f106 Only apply htmlentities() once on each data element
Redmine #6079
2016-04-06 15:22:11 +05:45
Chris Buechler
4d03eba976 Add Unbound to license.php. Ticket #5903 2016-04-05 21:36:26 -05:00
Renato Botelho
75cdfae39b Make sure source file exists 2016-04-05 22:13:38 -03:00
Renato Botelho
967794d2f4 Add a workaround on pfSense-upgrade to make sure repo package is replaced by correct one
(cherry picked from commit a491ec98d8)
2016-04-05 21:52:16 -03:00
Renato Botelho
db8621d8f4 Rework the way repo packages work
- Distribute only a single pfSense-repo package containing all templates
- Create a symlink pointing to selected repo
- Do not limit it only to pfSense-repo and pfSense-repo-devel

(cherry picked from commit a90f1c9b12)
2016-04-05 19:54:59 -03:00
Renato Botelho
0f03b62a47 Do not return -1, sh doesn't like it
(cherry picked from commit a35bf546b5)
2016-04-05 19:54:59 -03:00
Renato Botelho
f0edcaca5c Add repo pkg as dependency on base and base-nanobsd
(cherry picked from commit b884641b1c)
2016-04-05 19:54:59 -03:00
Renato Botelho
9c8600533d Add repo pkg post-install script
(cherry picked from commit e1deaf759a)
2016-04-05 19:54:59 -03:00
Renato Botelho
487bdff01b Create repo pkg PLIST dynamically
(cherry picked from commit 81bcdf9695)
2016-04-05 19:54:59 -03:00
Renato Botelho
e1fbc125cf Remove repo-devel package template
(cherry picked from commit e450f488eb)
2016-04-05 19:54:59 -03:00
Stephen Beaver
f332da5fbb Merge pull request #2843 from jlduran/fix-missing-space-status-ipsec 2016-04-05 12:48:11 -04:00
Jose Luis Duran
e96b20f612 Fix missing space in status_ipsec.php
Add a missing space before NAT-T
2016-04-05 13:38:01 -03:00
Stephen Beaver
067551a440 Eliminate "onclick" from child SA buttons
Revise recording of open children
2016-04-05 12:08:15 -04:00
jim-p
f5a1498854 Fix wording on advanced IPsec settings titles.
strongSwan doesn't get restarted in debug mode, it just changes the verbose level of log sections. Old terminology was leftover from racoon days.
2016-04-05 10:28:26 -04:00
jim-p
6bdfbf3b06 Correct logic for display of MAC address & vendor (if present). Fixes #6078 2016-04-05 10:21:20 -04:00
Renato Botelho
5ebb5db198 Merge pull request #2839 from phil-davis/patch-6 2016-04-05 09:38:28 -03:00
Stephen Beaver
3061702cce Merge pull request #2841 from NOYB/System_-_Miscellaneous_-_Remove_Personalizations 2016-04-05 07:59:34 -04:00
Stephen Beaver
64c3e9a58d Merge pull request #2840 from phil-davis/patch-7 2016-04-05 07:58:54 -04:00
Stephen Beaver
4659cb1aad Merge pull request #2838 from phil-davis/patch-5 2016-04-05 07:56:18 -04:00
Stephen Beaver
f4d13d55d7 Merge pull request #2837 from phil-davis/we 2016-04-05 07:55:41 -04:00
Stephen Beaver
b102779f21 Merge pull request #2836 from phil-davis/patch-4 2016-04-05 07:54:53 -04:00
NOYB
813c66737f System - Miscellaneous - Remove Personalizations
Remove "you" personalizations.
2016-04-05 00:29:39 -07:00
Phil Davis
a2d92b488b Allow to update existing alias from diag DNS
See Redmine #6077
This seems the easy and reasonable thing to do. Make the button text reflect what is going to happen "Add alias" or "Update alias". Then the backend code can just either create a new alias or overwrite an existing one.
2016-04-05 12:04:15 +05:45
Phil Davis
607b785f63 Handle alias from CNAME in diag_dns
If I resolve a CNAME with diag_dns, it gives back the translated FQDNs - e.g. www.inf.org translates to inf.org. Then press "Add Alias".
Problem: The existing code puts a "/32" CIDR after that in the alias "www_inf_org" in the config - "inf.org./32" - and if you then edit the "www_inf_org" alias it shows as "inf.org./32" in the Network or FQDN Address field. Normally when putting an FQDN into an alias, no CIDR is inserted.

This change fixes it.
2016-04-05 11:34:01 +05:45
Chris Buechler
d79ff71a58 Truncate alias name at 31 characters to prevent creating an invalid ruleset. Ticket #6075 2016-04-04 22:17:40 -05:00
Phil Davis
adb56dbd92 Remove "we" personalizations from config.console.inc
I changed "we" to "the system" - if someone thinks so, it could be changed to "pfSense" or $g["product_name"]\
If you want to do something different to what I did here, then feel free to close this and make the required changes.
2016-04-05 06:10:14 +05:45
Phil Davis
1e87fb3f50 Remove "we" personalizations 2016-04-05 05:58:10 +05:45
Phil Davis
9e820b594d Status IPsec only show time if established
When in the connecting state, this was showing "seconds (0:00:00) ago" - which seems odd.
I also fixed up the gettext() calls so they do not enclose convert_seconds_to_hms(), because that would pose translation difficulties.
And a little bit of indenting while I am here.
2016-04-05 05:29:43 +05:45
Stephen Beaver
146684ee65 Merge pull request #2835 from phil-davis/patch-5 2016-04-04 18:41:56 -04:00
Stephen Beaver
c67308d9b8 Merge pull request #2832 from NewEraCracker/lang-fixes 2016-04-04 18:41:21 -04:00
Stephen Beaver
2fdd07e9bb Merge pull request #2834 from phil-davis/patch-4 2016-04-04 18:40:09 -04:00
Phil Davis
4b5f2ab34d Prevent foreach crash if no IPsec
On a system with no IPsec defined, this would crash with:
[04-Apr-2016 21:33:24 Etc/UTC] PHP Stack trace:
[04-Apr-2016 21:33:24 Etc/UTC] PHP 1. {main}() /usr/local/www/status_ipsec.php:0
[04-Apr-2016 21:33:24 Etc/UTC] PHP 2. print_ipsec_body() /usr/local/www/status_ipsec.php:74

I did belts-and-braces here - moved the "if" up at line 72 and also added an if(is_array()) at line 394
2016-04-05 04:07:03 +05:45
Phil Davis
2507c8e913 Use ramdisk comment typos 2016-04-05 04:02:19 +05:45