Address conflicts with $config #24
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…to avoid conflicts with /etc/inc/config.inc.
…figuration itself.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As reported in #22, dshield.php reads configuration settings from dshield.ini into the array $config, and uses the information at various places in the script. Some settings, such as ccaddr, appear to be ignored when sending reports. The problem occurs because the script requires several include files from pfSense itself, one of which populates the same array with pfSense configuration information (through /etc/inc/config.inc), in effect clearing out the configuration settings from dshield.ini.
This set of commits is intended to fix that by renaming the array holding dshield.ini's settings from $config to $dshield_config. It also moves the empty From address check to support taking it from pfSense's configuration if it's not in dshield.ini.