Commit Graph

24143 Commits

Author SHA1 Message Date
Renato Botelho d9b05eb490 When an alias contain hosts, add IPs and networks to filterdns too, otherwise you end up with a pre-defined and non-persistent table. Fixes #3939 2014-11-05 15:31:31 -02:00
Renato Botelho 87d4456cf4 Merge pull request #1323 from derelict-pf/master 2014-11-05 07:07:55 -02:00
Renato Botelho f81011eadd Merge pull request #1320 from phil-davis/patch-2 2014-11-05 07:05:59 -02:00
Chris Buechler e39c963a09 fix up text 2014-11-04 23:31:36 -06:00
Chris Buechler 75756ab9c8 use a bit stronger of defaults in OpenVPN wizard 2014-11-04 23:19:45 -06:00
Chris Buechler 1c1fe6662f Fix WINS description. It's not 1999, and it wasn't a good description for back then either. If you're running WINS at this point on your AD DCs...get rid of the Win 9x boxes, or realize you don't actually need or want WINS on anything Windows 2000 and newer. 2014-11-04 23:08:13 -06:00
Chris Buechler 7a22ab9bb1 fix up text 2014-11-04 23:05:20 -06:00
Chris Buechler cbc6a13fa3 Fix updating of hosts file on host override updates by bringing back the same behavior from previous releases. 2014-11-04 22:01:36 -06:00
Chris Buechler b7419cfc0b skip disabled phase 1 entries in status output 2014-11-04 21:22:27 -06:00
Chris Buechler 261f2efe47 fix NAT-T status. The 'nat' in the status array just tells how the connection is configured, not what it's actually using. Port seems to be the best way to determine what it's using. Fix up some other text while here 2014-11-04 19:57:46 -06:00
Chris Buechler 531686c1ea use tabs rather than spaces, as most of this already did. 2014-11-04 19:09:53 -06:00
Chris Buechler d3c414e335 strongswan only has two options for NAT-T, force or auto. 2014-11-04 19:02:38 -06:00
Chris Buechler a43ddd1a5f setting nmbclusters to 0 just results in an error, remove unnecessary line 2014-11-04 18:44:29 -06:00
Chris Buechler 41367b9c2a remove old DISABLE_PHP_LINT_CHECKING, which dates way back to the CVS days and hasn't been relevant in years. 2014-11-04 18:34:03 -06:00
Chris Buechler 276efd64ea touch up text 2014-11-04 18:24:01 -06:00
Chris Buechler 32171e5935 fix invalid ipsec.conf 2014-11-04 18:18:22 -06:00
Chris Buechler f643a1f131 clean up text 2014-11-04 18:02:09 -06:00
jim-p ea20169a38 Use a better method of finding disks for SMART.
Old code was inaccurate and also listed entries that were symlinks to other disks
2014-11-04 15:49:54 -05:00
Ermal 0810a719e9 Restore 3 values back on NAT-T settings Just Enable now its Auto as per strongswan default. and off disabled mobike. Ticket #3979 2014-11-04 21:21:47 +01:00
Ermal 1db2634e32 Rename the options to actually make sense with strongswan 2014-11-04 21:08:25 +01:00
Ermal 86ef7a0a46 Remove Force options since it has not meaning for now. 2014-11-04 21:07:26 +01:00
Chris Buechler 756d867a89 fix comment 2014-11-04 13:31:38 -06:00
jim-p 8a2229e3da Catch some more sensitive info when sanitizing. 2014-11-04 12:43:24 -05:00
Renato Botelho f384d8a5d7 Merge pull request #1329 from phil-davis/patch-3 2014-11-03 15:27:32 -02:00
Phil Davis a3fad59243 Fixup dhcpd interface enabled check 2014-11-03 22:28:46 +05:45
Phil Davis ba667cc6f4 Fix console set interface IP address
Problem as per forum https://forum.pfsense.org/index.php?topic=83651.0
The problem comes whenever services_dhcpd_configure is called - the global $config gets reset from the actual current config, and any pending changes in the current process are lost.
It was introduced by commit 86ce2df
in which services_dhcpdv4_configure() does:

require_once('pkg-utils.inc')

and pkg-utils.inc does various stuff like:

if(file_exists("/cf/conf/use_xmlreader"))
require_once("xmlreader.inc");
else
require_once("xmlparse.inc");

which seems to cause a reset of the $config variable, thus losing the pending changes the user has entered at the console.

The top-level code in rc.initial.setlanip really does not need to (and should not) implement any changes along the way - it should collect all the answers from the user, then write_config and then make all the necessary calls to routines to implement the changes on the running system. This fixes it - defer any calls to services_dhcpd_configure() until after all questions are answered and write_config has happened.
2014-11-03 20:49:15 +05:45
Renato Botelho ec2904649f Merge pull request #1328 from wagonza/master 2014-11-03 10:56:16 -02:00
Renato Botelho fe9d4894a2 Fix indent 2014-11-03 10:54:21 -02:00
Renato Botelho 2783e408c4 Revert "Indent better"
This reverts commit a431bfc9e6.
2014-11-03 10:52:09 -02:00
Warren Baker d5566d43f4 Make sure defaults values are actually used. Fixes #3974 2014-11-03 14:45:13 +02:00
Renato Botelho 7bb24e18e0 Merge pull request #1327 from wagonza/pfSense-master 2014-11-03 08:48:52 -02:00
Warren Baker 46a989ce90 Indent here as well 2014-11-03 12:08:25 +02:00
Warren Baker a431bfc9e6 Indent better 2014-11-03 12:08:01 +02:00
Warren Baker 1b436de1ac Be consistent with the other pages 2014-11-03 12:04:42 +02:00
Warren Baker be11b6f1b8 Add braces 2014-11-03 12:03:08 +02:00
Renato Botelho 0a89d05955 Merge pull request #1324 from phil-davis/patch-3 2014-11-03 05:54:09 -02:00
Phil Davis 8727b3c8ec Set interface address from consol tidy output
While trying to see why this is not working for me (forum https://forum.pfsense.org/index.php?topic=83651.0 ) I have fixed some little things:
1) Get the new-lines right so the output of the restarting looks neat
2) Fix a comparison that had just a single equal sign - it did not break anything real because the subsequent code was just text output to the console. Now that text output does take notice of the correctly-evaluated condition, and $interface is not overwritten.

The issue in the forum post, about the interface IP address config not actually changing, is still the case, at least for me.

IMO these little tidy ups might as well be committed. They make this code better!
2014-11-03 11:49:45 +05:45
Ermal ce21dfca21 Correct dispaly of checkboxes for ipsec 2014-11-02 00:20:27 +01:00
Ermal 8cb7d3e386 Properly configure NAT Tranversal setting. 2014-11-01 23:41:38 +01:00
Ermal 6af857182b Remove debugging code 2014-11-01 20:54:49 +01:00
Ermal f3dd7e8cdb Properly test if FCGI is calling or are being triggered from shell. Normally Fixes #3361 2014-11-01 18:56:36 +01:00
Ermal 9fdc167f4e Properly test if FCGI is calling or are being triggered from shell. Normally Fixes #3361 2014-11-01 18:55:45 +01:00
Ermal d338018f47 Fixes #3938. Do more error checking. 2014-11-01 18:49:45 +01:00
Ermal d35dfaaecb Fixes #3941. When optimizations of the loops were made this brought the problems of overriding default gateway by dynamic interfaces. Try to stick to the first found for now! 2014-11-01 18:43:28 +01:00
Chris Buechler 038f6e9676 clarify logs generated by newwanip(v6) when restarting packages, it's not only IP changes that end up here (by design). 2014-11-01 01:42:19 -05:00
derelict-pf a94a16cd46 s/a/an/ and speling. 2014-10-31 15:05:22 -07:00
derelict-pf 162a7b4edf s/then/than/ 2014-10-31 14:55:14 -07:00
jim-p 8560c7568a Fix two more instances of rrd.tgz renaming. 2014-10-31 10:26:02 -04:00
Phil Davis c656bc75f8 Fix getext to gettext typo 2014-10-31 08:09:39 +05:45
Phil Davis 41aa5cd4da Fix getext to gettext typo 2014-10-31 08:08:54 +05:45