[arch-commits] Commit in bind/repos (12 files)
Date: Sunday, February 10, 2019 @ 03:01:09 Author: foutrelis Revision: 345822 archrelease: copy trunk to staging-x86_64 Added: bind/repos/staging-x86_64/ bind/repos/staging-x86_64/01-fs60913.patch (from rev 345821, bind/trunk/01-fs60913.patch) bind/repos/staging-x86_64/127.0.0.zone (from rev 345821, bind/trunk/127.0.0.zone) bind/repos/staging-x86_64/PKGBUILD (from rev 345821, bind/trunk/PKGBUILD) bind/repos/staging-x86_64/empty.zone (from rev 345821, bind/trunk/empty.zone) bind/repos/staging-x86_64/fix-FS#60286.patch (from rev 345821, bind/trunk/fix-FS#60286.patch) bind/repos/staging-x86_64/localhost.ip6.zone (from rev 345821, bind/trunk/localhost.ip6.zone) bind/repos/staging-x86_64/localhost.zone (from rev 345821, bind/trunk/localhost.zone) bind/repos/staging-x86_64/named.conf (from rev 345821, bind/trunk/named.conf) bind/repos/staging-x86_64/named.service (from rev 345821, bind/trunk/named.service) bind/repos/staging-x86_64/sysusers.conf (from rev 345821, bind/trunk/sysusers.conf) bind/repos/staging-x86_64/tmpfiles.conf (from rev 345821, bind/trunk/tmpfiles.conf) + 01-fs60913.patch | 45 + 127.0.0.zone | 10 +++ PKGBUILD | 134 +++ empty.zone |8 +++ fix-FS#60286.patch | 129 + localhost.ip6.zone | 10 +++ localhost.zone | 11 named.conf | 72 +++ named.service | 10 +++ sysusers.conf |1 tmpfiles.conf |1 11 files changed, 431 insertions(+) Copied: bind/repos/staging-x86_64/01-fs60913.patch (from rev 345821, bind/trunk/01-fs60913.patch) === --- staging-x86_64/01-fs60913.patch (rev 0) +++ staging-x86_64/01-fs60913.patch 2019-02-10 03:01:09 UTC (rev 345822) @@ -0,0 +1,45 @@ +From 0e5dd25fc5c70d65f6d537e93cf346e7f419 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= +Date: Thu, 3 Jan 2019 13:06:39 +0100 +Subject: [PATCH] When a forwarder fails and we're not in a forward-only mode + we go back to regular resolution. When this happens the fetch timer is + already running, and we might end up in a situation where we we create a + fetch for qname-minimized query and after that the timer is triggered and the + query is retried (fctx_try) - which causes relaunching of qname-minimization + fetch - and since we already have a qmin fetch for this fctx - assertion + failure. + + +diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c +index 8beecbcb07..ea122bd30c 100644 +--- a/lib/dns/resolver.c b/lib/dns/resolver.c +@@ -4012,6 +4012,7 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) { + options &= ~DNS_FETCHOPT_QMINIMIZE; + fctx_increference(fctx); + task = res->buckets[bucketnum].task; ++ fctx_stoptimer(fctx); + result = dns_resolver_createfetch(fctx->res, >qminname, + fctx->qmintype, >domain, + >nameservers, NULL, NULL, 0, +@@ -4343,13 +4344,12 @@ fctx_timeout(isc_task_t *task, isc_event_t *event) { +* timer. +*/ + result = fctx_starttimer(fctx); +- if (result != ISC_R_SUCCESS) ++ if (result != ISC_R_SUCCESS) { + fctx_done(fctx, result, __LINE__); +- else +- /* +- * Keep trying. +- */ ++ } else { ++ /* Keep trying */ + fctx_try(fctx, true, false); ++ } + } + + isc_event_free(); +-- +2.18.1 + Copied: bind/repos/staging-x86_64/127.0.0.zone (from rev 345821, bind/trunk/127.0.0.zone) === --- staging-x86_64/127.0.0.zone (rev 0) +++ staging-x86_64/127.0.0.zone 2019-02-10 03:01:09 UTC (rev 345822) @@ -0,0 +1,10 @@ +@ 1D IN SOA localhost. root.localhost. ( +42; serial (mmdd##) +3H; refresh +15M ; retry +1W; expiry +1D ) ; minimum ttl + +1D IN NS localhost. + +1.0.0.127.in-addr.arpa. 1D IN PTR localhost. Copied: bind/repos/staging-x86_64/PKGBUILD (from rev 345821, bind/trunk/PKGBUILD) === --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2019-02-10 03:01:09 UTC (rev 345822) @@ -0,0
[arch-commits] Commit in bind/repos (12 files)
Date: Sunday, January 13, 2019 @ 21:09:01 Author: foutrelis Revision: 344004 archrelease: copy trunk to staging-x86_64 Added: bind/repos/staging-x86_64/ bind/repos/staging-x86_64/01-fs60913.patch (from rev 344003, bind/trunk/01-fs60913.patch) bind/repos/staging-x86_64/127.0.0.zone (from rev 344003, bind/trunk/127.0.0.zone) bind/repos/staging-x86_64/PKGBUILD (from rev 344003, bind/trunk/PKGBUILD) bind/repos/staging-x86_64/empty.zone (from rev 344003, bind/trunk/empty.zone) bind/repos/staging-x86_64/fix-FS#60286.patch (from rev 344003, bind/trunk/fix-FS#60286.patch) bind/repos/staging-x86_64/localhost.ip6.zone (from rev 344003, bind/trunk/localhost.ip6.zone) bind/repos/staging-x86_64/localhost.zone (from rev 344003, bind/trunk/localhost.zone) bind/repos/staging-x86_64/named.conf (from rev 344003, bind/trunk/named.conf) bind/repos/staging-x86_64/named.service (from rev 344003, bind/trunk/named.service) bind/repos/staging-x86_64/sysusers.conf (from rev 344003, bind/trunk/sysusers.conf) bind/repos/staging-x86_64/tmpfiles.conf (from rev 344003, bind/trunk/tmpfiles.conf) + 01-fs60913.patch | 45 + 127.0.0.zone | 10 +++ PKGBUILD | 134 +++ empty.zone |8 +++ fix-FS#60286.patch | 129 + localhost.ip6.zone | 10 +++ localhost.zone | 11 named.conf | 72 +++ named.service | 10 +++ sysusers.conf |1 tmpfiles.conf |1 11 files changed, 431 insertions(+) Copied: bind/repos/staging-x86_64/01-fs60913.patch (from rev 344003, bind/trunk/01-fs60913.patch) === --- staging-x86_64/01-fs60913.patch (rev 0) +++ staging-x86_64/01-fs60913.patch 2019-01-13 21:09:01 UTC (rev 344004) @@ -0,0 +1,45 @@ +From 0e5dd25fc5c70d65f6d537e93cf346e7f419 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= +Date: Thu, 3 Jan 2019 13:06:39 +0100 +Subject: [PATCH] When a forwarder fails and we're not in a forward-only mode + we go back to regular resolution. When this happens the fetch timer is + already running, and we might end up in a situation where we we create a + fetch for qname-minimized query and after that the timer is triggered and the + query is retried (fctx_try) - which causes relaunching of qname-minimization + fetch - and since we already have a qmin fetch for this fctx - assertion + failure. + + +diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c +index 8beecbcb07..ea122bd30c 100644 +--- a/lib/dns/resolver.c b/lib/dns/resolver.c +@@ -4012,6 +4012,7 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) { + options &= ~DNS_FETCHOPT_QMINIMIZE; + fctx_increference(fctx); + task = res->buckets[bucketnum].task; ++ fctx_stoptimer(fctx); + result = dns_resolver_createfetch(fctx->res, >qminname, + fctx->qmintype, >domain, + >nameservers, NULL, NULL, 0, +@@ -4343,13 +4344,12 @@ fctx_timeout(isc_task_t *task, isc_event_t *event) { +* timer. +*/ + result = fctx_starttimer(fctx); +- if (result != ISC_R_SUCCESS) ++ if (result != ISC_R_SUCCESS) { + fctx_done(fctx, result, __LINE__); +- else +- /* +- * Keep trying. +- */ ++ } else { ++ /* Keep trying */ + fctx_try(fctx, true, false); ++ } + } + + isc_event_free(); +-- +2.18.1 + Copied: bind/repos/staging-x86_64/127.0.0.zone (from rev 344003, bind/trunk/127.0.0.zone) === --- staging-x86_64/127.0.0.zone (rev 0) +++ staging-x86_64/127.0.0.zone 2019-01-13 21:09:01 UTC (rev 344004) @@ -0,0 +1,10 @@ +@ 1D IN SOA localhost. root.localhost. ( +42; serial (mmdd##) +3H; refresh +15M ; retry +1W; expiry +1D ) ; minimum ttl + +1D IN NS localhost. + +1.0.0.127.in-addr.arpa. 1D IN PTR localhost. Copied: bind/repos/staging-x86_64/PKGBUILD (from rev 344003, bind/trunk/PKGBUILD) === --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2019-01-13 21:09:01 UTC (rev 344004) @@ -0,0
[arch-commits] Commit in bind/repos (12 files)
Date: Friday, January 11, 2019 @ 07:46:35 Author: foutrelis Revision: 343570 archrelease: copy trunk to staging-x86_64 Added: bind/repos/staging-x86_64/ bind/repos/staging-x86_64/01-fs60913.patch (from rev 343569, bind/trunk/01-fs60913.patch) bind/repos/staging-x86_64/127.0.0.zone (from rev 343569, bind/trunk/127.0.0.zone) bind/repos/staging-x86_64/PKGBUILD (from rev 343569, bind/trunk/PKGBUILD) bind/repos/staging-x86_64/empty.zone (from rev 343569, bind/trunk/empty.zone) bind/repos/staging-x86_64/fix-FS#60286.patch (from rev 343569, bind/trunk/fix-FS#60286.patch) bind/repos/staging-x86_64/localhost.ip6.zone (from rev 343569, bind/trunk/localhost.ip6.zone) bind/repos/staging-x86_64/localhost.zone (from rev 343569, bind/trunk/localhost.zone) bind/repos/staging-x86_64/named.conf (from rev 343569, bind/trunk/named.conf) bind/repos/staging-x86_64/named.service (from rev 343569, bind/trunk/named.service) bind/repos/staging-x86_64/sysusers.conf (from rev 343569, bind/trunk/sysusers.conf) bind/repos/staging-x86_64/tmpfiles.conf (from rev 343569, bind/trunk/tmpfiles.conf) + 01-fs60913.patch | 45 + 127.0.0.zone | 10 +++ PKGBUILD | 134 +++ empty.zone |8 +++ fix-FS#60286.patch | 129 + localhost.ip6.zone | 10 +++ localhost.zone | 11 named.conf | 72 +++ named.service | 10 +++ sysusers.conf |1 tmpfiles.conf |1 11 files changed, 431 insertions(+) Copied: bind/repos/staging-x86_64/01-fs60913.patch (from rev 343569, bind/trunk/01-fs60913.patch) === --- staging-x86_64/01-fs60913.patch (rev 0) +++ staging-x86_64/01-fs60913.patch 2019-01-11 07:46:35 UTC (rev 343570) @@ -0,0 +1,45 @@ +From 0e5dd25fc5c70d65f6d537e93cf346e7f419 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= +Date: Thu, 3 Jan 2019 13:06:39 +0100 +Subject: [PATCH] When a forwarder fails and we're not in a forward-only mode + we go back to regular resolution. When this happens the fetch timer is + already running, and we might end up in a situation where we we create a + fetch for qname-minimized query and after that the timer is triggered and the + query is retried (fctx_try) - which causes relaunching of qname-minimization + fetch - and since we already have a qmin fetch for this fctx - assertion + failure. + + +diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c +index 8beecbcb07..ea122bd30c 100644 +--- a/lib/dns/resolver.c b/lib/dns/resolver.c +@@ -4012,6 +4012,7 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) { + options &= ~DNS_FETCHOPT_QMINIMIZE; + fctx_increference(fctx); + task = res->buckets[bucketnum].task; ++ fctx_stoptimer(fctx); + result = dns_resolver_createfetch(fctx->res, >qminname, + fctx->qmintype, >domain, + >nameservers, NULL, NULL, 0, +@@ -4343,13 +4344,12 @@ fctx_timeout(isc_task_t *task, isc_event_t *event) { +* timer. +*/ + result = fctx_starttimer(fctx); +- if (result != ISC_R_SUCCESS) ++ if (result != ISC_R_SUCCESS) { + fctx_done(fctx, result, __LINE__); +- else +- /* +- * Keep trying. +- */ ++ } else { ++ /* Keep trying */ + fctx_try(fctx, true, false); ++ } + } + + isc_event_free(); +-- +2.18.1 + Copied: bind/repos/staging-x86_64/127.0.0.zone (from rev 343569, bind/trunk/127.0.0.zone) === --- staging-x86_64/127.0.0.zone (rev 0) +++ staging-x86_64/127.0.0.zone 2019-01-11 07:46:35 UTC (rev 343570) @@ -0,0 +1,10 @@ +@ 1D IN SOA localhost. root.localhost. ( +42; serial (mmdd##) +3H; refresh +15M ; retry +1W; expiry +1D ) ; minimum ttl + +1D IN NS localhost. + +1.0.0.127.in-addr.arpa. 1D IN PTR localhost. Copied: bind/repos/staging-x86_64/PKGBUILD (from rev 343569, bind/trunk/PKGBUILD) === --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2019-01-11 07:46:35 UTC (rev 343570) @@ -0,0
[arch-commits] Commit in bind/repos (12 files)
Date: Friday, January 4, 2019 @ 19:21:07 Author: seblu Revision: 342961 archrelease: copy trunk to testing-x86_64 Added: bind/repos/testing-x86_64/ bind/repos/testing-x86_64/01-fs60913.patch (from rev 342960, bind/trunk/01-fs60913.patch) bind/repos/testing-x86_64/127.0.0.zone (from rev 342960, bind/trunk/127.0.0.zone) bind/repos/testing-x86_64/PKGBUILD (from rev 342960, bind/trunk/PKGBUILD) bind/repos/testing-x86_64/empty.zone (from rev 342960, bind/trunk/empty.zone) bind/repos/testing-x86_64/fix-FS#60286.patch (from rev 342960, bind/trunk/fix-FS#60286.patch) bind/repos/testing-x86_64/localhost.ip6.zone (from rev 342960, bind/trunk/localhost.ip6.zone) bind/repos/testing-x86_64/localhost.zone (from rev 342960, bind/trunk/localhost.zone) bind/repos/testing-x86_64/named.conf (from rev 342960, bind/trunk/named.conf) bind/repos/testing-x86_64/named.service (from rev 342960, bind/trunk/named.service) bind/repos/testing-x86_64/sysusers.conf (from rev 342960, bind/trunk/sysusers.conf) bind/repos/testing-x86_64/tmpfiles.conf (from rev 342960, bind/trunk/tmpfiles.conf) + 01-fs60913.patch | 45 + 127.0.0.zone | 10 +++ PKGBUILD | 134 +++ empty.zone |8 +++ fix-FS#60286.patch | 129 + localhost.ip6.zone | 10 +++ localhost.zone | 11 named.conf | 72 +++ named.service | 10 +++ sysusers.conf |1 tmpfiles.conf |1 11 files changed, 431 insertions(+) Copied: bind/repos/testing-x86_64/01-fs60913.patch (from rev 342960, bind/trunk/01-fs60913.patch) === --- testing-x86_64/01-fs60913.patch (rev 0) +++ testing-x86_64/01-fs60913.patch 2019-01-04 19:21:07 UTC (rev 342961) @@ -0,0 +1,45 @@ +From 0e5dd25fc5c70d65f6d537e93cf346e7f419 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= +Date: Thu, 3 Jan 2019 13:06:39 +0100 +Subject: [PATCH] When a forwarder fails and we're not in a forward-only mode + we go back to regular resolution. When this happens the fetch timer is + already running, and we might end up in a situation where we we create a + fetch for qname-minimized query and after that the timer is triggered and the + query is retried (fctx_try) - which causes relaunching of qname-minimization + fetch - and since we already have a qmin fetch for this fctx - assertion + failure. + + +diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c +index 8beecbcb07..ea122bd30c 100644 +--- a/lib/dns/resolver.c b/lib/dns/resolver.c +@@ -4012,6 +4012,7 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) { + options &= ~DNS_FETCHOPT_QMINIMIZE; + fctx_increference(fctx); + task = res->buckets[bucketnum].task; ++ fctx_stoptimer(fctx); + result = dns_resolver_createfetch(fctx->res, >qminname, + fctx->qmintype, >domain, + >nameservers, NULL, NULL, 0, +@@ -4343,13 +4344,12 @@ fctx_timeout(isc_task_t *task, isc_event_t *event) { +* timer. +*/ + result = fctx_starttimer(fctx); +- if (result != ISC_R_SUCCESS) ++ if (result != ISC_R_SUCCESS) { + fctx_done(fctx, result, __LINE__); +- else +- /* +- * Keep trying. +- */ ++ } else { ++ /* Keep trying */ + fctx_try(fctx, true, false); ++ } + } + + isc_event_free(); +-- +2.18.1 + Copied: bind/repos/testing-x86_64/127.0.0.zone (from rev 342960, bind/trunk/127.0.0.zone) === --- testing-x86_64/127.0.0.zone (rev 0) +++ testing-x86_64/127.0.0.zone 2019-01-04 19:21:07 UTC (rev 342961) @@ -0,0 +1,10 @@ +@ 1D IN SOA localhost. root.localhost. ( +42; serial (mmdd##) +3H; refresh +15M ; retry +1W; expiry +1D ) ; minimum ttl + +1D IN NS localhost. + +1.0.0.127.in-addr.arpa. 1D IN PTR localhost. Copied: bind/repos/testing-x86_64/PKGBUILD (from rev 342960, bind/trunk/PKGBUILD) === --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2019-01-04 19:21:07 UTC (rev 342961) @@ -0,0 +1,134 @@