From e3ce0263558cc75578e6241e8f57366b5e685db4 Mon Sep 17 00:00:00 2001
From: Viktor Liu <17948409+lixmal@users.noreply.github.com>
Date: Thu, 10 Apr 2025 13:21:14 +0200
Subject: [PATCH] [client] Fix race dns cleanup race condition (#3652)

---
 client/internal/dns/server.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/internal/dns/server.go b/client/internal/dns/server.go
index 74ab6717f..65b90e5f0 100644
--- a/client/internal/dns/server.go
+++ b/client/internal/dns/server.go
@@ -467,6 +467,11 @@ func (s *DefaultServer) applyHostConfig() {
 		return
 	}
 
+	// prevent reapplying config if we're shutting down
+	if s.ctx.Err() != nil {
+		return
+	}
+
 	config := s.currentConfig
 
 	existingDomains := make(map[string]struct{})