[PR #2692] [MERGED] merge the Forward and Hint zone types into one #3244

New issue

Closed

opened 2026-03-16 11:33:03 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 11:33:03 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/2692
Author: @japaric
Created: 12/19/2024
Status: ✅ Merged
Merged: 12/20/2024
Merged by: @djc

Base: main ← Head: ja-merge-hint-forward

📝 Commits (3)

fa3e245 remove unused structs
163b455 server: merge the Forward and Hint zone types into one
6c04809 bin: merge the Forward and Hint zone types into one

📊 Changes

16 files changed (+41 additions, -98 deletions)

View changed files

📝 bin/src/lib.rs (+15 -70)
📝 conformance/packages/dns-test/src/templates/hickory.resolver.toml.jinja (+1 -1)
📝 crates/server/src/authority/catalog.rs (+1 -1)
📝 crates/server/src/authority/zone_type.rs (+2 -4)
📝 crates/server/src/store/blocklist/authority.rs (+5 -5)
📝 crates/server/src/store/forwarder/authority.rs (+2 -2)
📝 crates/server/src/store/recursor/authority.rs (+2 -2)
📝 tests/e2e-tests/src/resolver/do_not_query.toml.jinja (+1 -1)
📝 tests/integration-tests/tests/integration/chained_authority_tests.rs (+1 -1)
📝 tests/test-data/test_configs/all_supported_dnssec.toml (+1 -1)
📝 tests/test-data/test_configs/chained_blocklist.toml (+2 -2)
📝 tests/test-data/test_configs/consulting_blocklist.toml (+2 -2)
📝 tests/test-data/test_configs/dnssec_with_update.toml (+1 -1)
📝 tests/test-data/test_configs/example.toml (+1 -1)
📝 tests/test-data/test_configs/example_forwarder.toml (+2 -2)
📝 tests/test-data/test_configs/example_recursor.toml (+2 -2)

📄 Description

as suggested by marcus0x62

depends on #2690

~~I think with this we can call RFC #2195 done?~~

closes #2195

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hickory-dns/hickory-dns/pull/2692 **Author:** [@japaric](https://github.com/japaric) **Created:** 12/19/2024 **Status:** ✅ Merged **Merged:** 12/20/2024 **Merged by:** [@djc](https://github.com/djc) **Base:** `main` ← **Head:** `ja-merge-hint-forward` --- ### 📝 Commits (3) - [`fa3e245`](https://github.com/hickory-dns/hickory-dns/commit/fa3e245237381490e4b9aebe646d72b718315cd1) remove unused structs - [`163b455`](https://github.com/hickory-dns/hickory-dns/commit/163b455ffd9183f160a5e08ee81d45e7e1594f10) server: merge the Forward and Hint zone types into one - [`6c04809`](https://github.com/hickory-dns/hickory-dns/commit/6c04809dcc292602d59eac90022ed58b6634144b) bin: merge the Forward and Hint zone types into one ### 📊 Changes **16 files changed** (+41 additions, -98 deletions) <details> <summary>View changed files</summary> 📝 `bin/src/lib.rs` (+15 -70) 📝 `conformance/packages/dns-test/src/templates/hickory.resolver.toml.jinja` (+1 -1) 📝 `crates/server/src/authority/catalog.rs` (+1 -1) 📝 `crates/server/src/authority/zone_type.rs` (+2 -4) 📝 `crates/server/src/store/blocklist/authority.rs` (+5 -5) 📝 `crates/server/src/store/forwarder/authority.rs` (+2 -2) 📝 `crates/server/src/store/recursor/authority.rs` (+2 -2) 📝 `tests/e2e-tests/src/resolver/do_not_query.toml.jinja` (+1 -1) 📝 `tests/integration-tests/tests/integration/chained_authority_tests.rs` (+1 -1) 📝 `tests/test-data/test_configs/all_supported_dnssec.toml` (+1 -1) 📝 `tests/test-data/test_configs/chained_blocklist.toml` (+2 -2) 📝 `tests/test-data/test_configs/consulting_blocklist.toml` (+2 -2) 📝 `tests/test-data/test_configs/dnssec_with_update.toml` (+1 -1) 📝 `tests/test-data/test_configs/example.toml` (+1 -1) 📝 `tests/test-data/test_configs/example_forwarder.toml` (+2 -2) 📝 `tests/test-data/test_configs/example_recursor.toml` (+2 -2) </details> ### 📄 Description as suggested by marcus0x62 depends on #2690 ~~I think with this we can call RFC #2195 done?~~ closes #2195 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>