diff options
| author | Olivier Cochard <olivier@FreeBSD.org> | 2021-12-11 02:14:09 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2021-12-11 09:51:28 +0000 |
| commit | 1f05895ca06edbf6ba8bdf7e221c8a1057c0fd71 (patch) | |
| tree | 728522f76ea4c4c7a1dd15350a4360e3a87d1784 | |
| parent | 9a85028f4508c0fa1edaefa70ad66cfcb5c253c3 (diff) | |
| download | ports-1f05895ca06edbf6ba8bdf7e221c8a1057c0fd71.tar.gz ports-1f05895ca06edbf6ba8bdf7e221c8a1057c0fd71.zip | |
dns/dnsmasq: fix error "config error is REFUSED (EDE: not ready)"
Fix --address=/#/...... which was lost in 2.86
ML message:
https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/msg15508.html
Git commit:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=26bbf5a314d833beaf0f147d24409969f05f3dba
PR: 260331
Obtained from: Simon Kelley (upstream maintainer)
| -rw-r--r-- | dns/dnsmasq/Makefile | 2 | ||||
| -rw-r--r-- | dns/dnsmasq/files/patch-src_network.c | 81 |
2 files changed, 82 insertions, 1 deletions
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index 477980deff20..844e485854c7 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -3,7 +3,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.86 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/ \ diff --git a/dns/dnsmasq/files/patch-src_network.c b/dns/dnsmasq/files/patch-src_network.c new file mode 100644 index 000000000000..53b6545ddff4 --- /dev/null +++ b/dns/dnsmasq/files/patch-src_network.c @@ -0,0 +1,81 @@ +From 26bbf5a314d833beaf0f147d24409969f05f3dba Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Thu, 23 Sep 2021 10:54:46 +0100 +Subject: [PATCH] Fix --address=/#/...... which was lost in 2.86 + +A victim of the domain-search rewrite. Apologies. +--- + CHANGELOG | 8 ++++++++ + src/network.c | 3 ++- + src/option.c | 17 ++++++++++++----- + 3 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 5e54df9..8652dd8 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,11 @@ ++version 2.87 ++ Allow arbitrary prefix lengths in --rev-server and ++ --domain=....,local ++ ++ Replace --address=/#/..... functionality which got ++ missed in the 2.86 domain search rewrite. ++ ++ + version 2.86 + Handle DHCPREBIND requests in the DHCPv6 server code. + Thanks to Aichun Li for spotting this omission, and the initial +diff --git a/src/network.c b/src/network.c +index 296c7bd..3c1c176 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -1626,7 +1626,8 @@ void check_servers(int no_loop_check) + continue; + + if ((serv->flags & SERV_LITERAL_ADDRESS) && +- !(serv->flags & (SERV_6ADDR | SERV_4ADDR | SERV_ALL_ZEROS))) ++ !(serv->flags & (SERV_6ADDR | SERV_4ADDR | SERV_ALL_ZEROS)) && ++ strlen(serv->domain)) + { + count--; + if (++locals <= LOCALS_LOGGED) +diff --git a/src/option.c b/src/option.c +index e64c3ab..54d89aa 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -2764,7 +2764,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + + if (!arg || !*arg) + flags = SERV_LITERAL_ADDRESS; +- else if (option == 'A') ++ else if (option != 'S') + { + /* # as literal address means return zero address for 4 and 6 */ + if (strcmp(arg, "#") == 0) +@@ -2788,11 +2788,18 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + while (1) + { + /* server=//1.2.3.4 is special. */ +- if (strlen(domain) == 0 && lastdomain) +- flags |= SERV_FOR_NODOTS; +- else +- flags &= ~SERV_FOR_NODOTS; ++ if (lastdomain) ++ { ++ if (strlen(domain) == 0) ++ flags |= SERV_FOR_NODOTS; ++ else ++ flags &= ~SERV_FOR_NODOTS; + ++ /* address=/#/ matches the same as without domain */ ++ if (option != 'S' && domain[0] == '#' && domain[1] == 0) ++ domain[0] = 0; ++ } ++ + if (!add_update_server(flags, &serv_addr, &source_addr, interface, domain, &addr)) + ret_err(gen_err); + +-- +2.20.1 + |