Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix record_source() sometimes incorrectly returning regex.list #413

Merged
merged 1 commit into from
Nov 5, 2018

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Nov 5, 2018

By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:

Please submit all pull requests against the development branch. Failure to do so will delay or deny your request

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10


Fix interchanged indices in dnsmasq.h. This bug resulted in sometimes having displayed regex.list even though the blocking was done due to a gravity.list entry. Although being of only cosmetic nature, this bug showed up every now and then and was never really traceable.

The problem appeared when more than one additional hosts file was loaded (e.g. gravity.list + black.list). As the first file would have gotten index 3 and the second 4, and record_source(4) returned the path of regex.list. This is now fixed by defining regex.list to ID 3 and start all additional HOSTS files from 4 onward.

This template was created based on the work of udemy-dl.

… having displayed regex.list even though the blocking was done due to a gravity.list entry.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the Bugfix label Nov 5, 2018
@DL6ER DL6ER added this to the v4.1 milestone Nov 5, 2018
@DL6ER DL6ER requested a review from a team November 5, 2018 21:12
@AzureMarker AzureMarker merged commit e744e08 into release/4.1 Nov 5, 2018
@AzureMarker AzureMarker deleted the fix/record_source branch November 5, 2018 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants