starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-01-11 20:00:28 +01:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

[PR #1101] [MERGED] domains/restricted_nameservers: check dnsConfig.Resolvers instead #1879

New Issue
Closed
opened 2025-12-29 02:32:05 +01:00 by adam · 0 comments
adam commented 2025-12-29 02:32:05 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/1101
Author: @johnae
Created: 12/27/2022
Status: ✅ Merged
Merged: 12/31/2022
Merged by: @juanfont

Base: main ← Head: main

📝 Commits (2)

  • e410cf0 domains/restricted_nameservers: check dnsConfig.Resolvers instead of dnsConfig.Nameservers
  • 4cdc7fc Merge branch 'main' into main

📊 Changes

1 file changed (+2 additions, -2 deletions)

View changed files

📝 config.go (+2 -2)

📄 Description

With this change, domains are applied if there are any dnsConfig.Resolvers rather than any dnsConfig.Nameservers. Without this change, using nextdns doh would disallow setting any domains (because it checked dnsConfig.Nameservers which would be empty in the case of NextDNS DOH).

  • read the CONTRIBUTING guidelines
  • raised a GitHub issue or discussed it on the projects chat beforehand
  • added unit tests
  • added integration tests
  • updated documentation if needed
  • updated CHANGELOG.md

🔄 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/juanfont/headscale/pull/1101 **Author:** [@johnae](https://github.com/johnae) **Created:** 12/27/2022 **Status:** ✅ Merged **Merged:** 12/31/2022 **Merged by:** [@juanfont](https://github.com/juanfont) **Base:** `main` ← **Head:** `main` --- ### 📝 Commits (2) - [`e410cf0`](https://github.com/juanfont/headscale/commit/e410cf00a41d8f6b08db2fb7842bf5faf551553c) domains/restricted_nameservers: check dnsConfig.Resolvers instead of dnsConfig.Nameservers - [`4cdc7fc`](https://github.com/juanfont/headscale/commit/4cdc7fc7fc8833dad808778c681fdff5dc70889d) Merge branch 'main' into main ### 📊 Changes **1 file changed** (+2 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `config.go` (+2 -2) </details> ### 📄 Description With this change, domains are applied if there are any `dnsConfig.Resolvers` rather than any `dnsConfig.Nameservers`. Without this change, using nextdns doh would disallow setting any domains (because it checked `dnsConfig.Nameservers` which would be empty in the case of NextDNS DOH). <!-- Please tick if the following things apply. You… --> - [X] read the [CONTRIBUTING guidelines](README.md#contributing) - [ ] raised a GitHub issue or discussed it on the projects chat beforehand - [ ] added unit tests - [ ] added integration tests - [ ] updated documentation if needed - [ ] updated CHANGELOG.md <!-- If applicable, please reference the issue using `Fixes #XXX` and add tests to cover your new code. --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 02:32:05 +01:00
adam closed this issue 2025-12-29 02:32:05 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
CLI
DERP
DNS
Nix
OIDC
SSH
bug
database
documentation
duplicate
enhancement
faq
good first issue
grants
help wanted
might-come
needs design doc
needs investigation
no-stale-bot
out of scope
performance
policy 📝
pull-request
Mirrored from GitHub Pull Request
 question
regression
routes
stale
tags
tailscale-feature-gap
well described ❤️
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adam
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#1879
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?