Ensure that the tel2-search is a top-level domain.

Signed-off-by: Thomas Hallgren <[email protected]>
telepresenceio · Apr 15, 2024 · 8da2bae · 8da2bae
1 parent 7a039b4
commit 8da2bae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/client/rootd/dns/server.go b/pkg/client/rootd/dns/server.go
@@ -513,12 +513,14 @@ func (s *Server) processSearchPaths(g *dgroup.Group, processor func(context.Cont
 				}
 				prevDas = das
 
-				routes := make(map[string]struct{}, len(das.domains))
+				routes := make(map[string]struct{}, len(das.domains)+1)
 				for _, domain := range das.domains {
 					if domain != "" {
 						routes[domain] = struct{}{}
 					}
 				}
+				routes[tel2SubDomain] = struct{}{}
+
 				s.Lock()
 				s.routes = routes
 

diff --git a/pkg/client/rootd/dns/server_darwin.go b/pkg/client/rootd/dns/server_darwin.go
@@ -133,7 +133,6 @@ func (s *Server) updateResolverFiles(c context.Context, resolverDirName string,
 	}
 	clusterDomain := strings.TrimSuffix(s.clusterDomain, ".")
 	domains[clusterDomain] = newDomainResolveFile(clusterDomain)
-	domains[tel2SubDomain] = newDomainResolveFile(tel2SubDomain)
 
 nextSearch:
 	for _, search := range s.search {