UnivNautes

Merge pull request #1326 from phil-davis/patch-5

Fix obviously broken test in rc.initial.setlanip

IMO might as well back-port any obviously wrong code to 2.1 branch, just in case anybody on 2.1.n cares for it or there is a need for another 2.1.n release.

Merge pull request #1320 from phil-davis/patch-2

fix up text

use a bit stronger of defaults in OpenVPN wizard

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.

fix up text

Fix updating of hosts file on host override updates by bringing back the same behavior from previous releases.

skip disabled phase 1 entries in status output

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

use tabs rather than spaces, as most of this already did.

strongswan only has two options for NAT-T, force or auto.

setting nmbclusters to 0 just results in an error, remove unnecessary line

remove old DISABLE_PHP_LINT_CHECKING, which dates way back to the CVS days and hasn't been relevant in years.

touch up text

fix invalid ipsec.conf

clean up text

Use a better method of finding disks for SMART.
Old code was inaccurate and also listed entries that were symlinks to other disks

Restore 3 values back on NAT-T settings Just Enable now its Auto as per strongswan default. and off disabled mobike. Ticket #3979

Rename the options to actually make sense with strongswan

Remove Force options since it has not meaning for now.

fix comment

Catch some more sensitive info when sanitizing.

Catch some more sensitive info when sanitizing.

Merge pull request #1329 from phil-davis/patch-3

Fixup dhcpd interface enabled check

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....

Merge pull request #1328 from wagonza/master

Fix indent

Revert "Indent better"

This reverts commit a431bfc9e698c753d9a54218af9076184deb6251.

Make sure defaults values are actually used. Fixes #3974

Merge pull request #1327 from wagonza/pfSense-master

Indent here as well

Indent better

Be consistent with the other pages

Add braces

Fix obviously broken test in rc.initial.setlanip

IMO might as well back-port any obviously wrong code to 2.1 branch, just in case anybody on 2.1.n cares for it or there is a need for another 2.1.n release.

Merge pull request #1324 from phil-davis/patch-3

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...

Correct dispaly of checkboxes for ipsec

Properly configure NAT Tranversal setting.

Remove debugging code

Properly test if FCGI is calling or are being triggered from shell. Normally Fixes #3361

Properly test if FCGI is calling or are being triggered from shell. Normally Fixes #3361

Fixes #3938. Do more error checking.

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!

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!

clarify logs generated by newwanip(v6) when restarting packages, it's not only IP changes that end up here (by design).

s/a/an/ and speling.

s/then/than/