Update embedded dnsmasq to v2.87test4-6 #1230
Merged
Conversation
This file contains 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
…man page Signed-off-by: DL6ER <dl6er@dl6er.de>
add_resource_record() returns 1 if the record was added. Only increment anscount of so. Thanks to Petr Menšík for spotting the problem. Signed-off-by: DL6ER <dl6er@dl6er.de>
--address=/münchen.de/ is not accepted unless LOCALEDIR is defined on build. It is not by default. If LIBIDN1 or 2 is defined, call setlocale to initialize locale required to translate domains to ascii form. Signed-off-by: Petr Menšík <pemensik@redhat.com> Signed-off-by: DL6ER <dl6er@dl6er.de>
Transitional encoding accepts every emoticon you can think about. Because setlocale were not enabled before, IDN 2003 input was not accepted by dnsmasq. It makes no sense therefore to maintain backward compatibility. Accept only proper encoded unicode names and reject random unicode characters. Signed-off-by: Petr Menšík <pemensik@redhat.com> Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
The domain-match rewrite didn't take into account that domain names are case-insensitive, so things like --address=/Example.com/..... didn't work correctly. Signed-off-by: DL6ER <dl6er@dl6er.de>
This reverts commit 93cf7f8.
The IDs logged when --log-queries=extra is in effect can be wrong in three cases. 1) When query is retried in response to a a SERVFAIL or REFUSED answer from upstream. In this case the ID of an unrelated query will appear in the answer log lines. 2) When the same query arrives from two clients. The query is sent upstream once, as designed, and the result returned to both clients, as designed, but the reply to the first client gets the log-ID of the second query in error. 3) When a query arrives, is sent upstream, and the reply comes back, but the transaction is blocked awaiting a DNSSEC query needed to validate the reply. If the client retries the query in this state, the blocking DNSSEC query will be resent, as designed, but that send will be logged with the ID of the original, currently blocked, query. Thanks to Dominik Derigs for his analysis of this problem. Signed-off-by: DL6ER <dl6er@dl6er.de>
Commit 32e15c3f458c2e8838a9ecf7d478ecb6750516bf added the following
change:
--- a/src/dnsmasq/option.c
+++ b/src/dnsmasq/option.c
@@ -654,7 +654,7 @@ static char *canonicalise_opt(char *s)
return 0;
if (strlen(s) == 0)
- return "";
+ return opt_string_alloc("");
unhide_metas(s);
if (!(ret = canonicalise(s, &nomem)) && nomem)
Unfortunately, opt_string_alloc(const char *cp) returns NULL when
strlen(cp) == 0, which in turn causes --rebind-domain-ok='' to crash
with SIGSEGV.
Signed-off-by: DL6ER <dl6er@dl6er.de>
The 2.86 domain-match rewrite changed matching from whole-labels to substring matching, so example.com would match example.com and www.example.com, as before, but also goodexample.com, which is a regression. This restores the original behaviour. Also restore the behaviour of --rebind-domain-ok=// to match domains with onlt a single label and no dots. Thanks to Sung Pae for reporting these bugs and supplying an initial patch. Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
DL6ER
changed the title
|
Ready for review+merge in preparation of a (pre-)Christmas release |
yubiuser
approved these changes
Dec 20, 2021
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-ftl-v5-12-web-v5-9-and-core-v5-7-released/51795/1 |
This was referenced Dec 22, 2021
This was referenced Dec 22, 2021
Closed
This was referenced Jan 3, 2022
1 task
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.
By submitting this pull request, I confirm the following:
How familiar are you with the codebase?:
10
This mainly adds bugfixes for issues reported against the current embedded version of
dnsmasq. The first two bug fixes are important for us as we have seen them being reported on our own platforms.rebind-domain-okoption recently introduced bydnsmasqv2.86