TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-11 21:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ipn/ipnlocal: add new DNS and subnet router policies" (#9962)

Browse Source 
This reverts commit 32194cdc70.

Signed-off-by: Nick O'Neill <nick@tailscale.com>
This commit is contained in:
Andrea Gottardo
2023-10-24 17:07:25 -07:00
committed by GitHub
parent a7e4cebb90
commit 741d7bcefe
3 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ipn/ipnlocal/profiles.go
View File

@@ -19,7 +19,6 @@ import (
"tailscale.com/types/logger"
"tailscale.com/util/clientmetric"
"tailscale.com/util/cmpx"
"tailscale.com/util/syspolicy"
"tailscale.com/util/winutil"
)
@@ -464,10 +463,6 @@ var defaultPrefs = func() ipn.PrefsView {
prefs.ShieldsUp = shieldsUp == "never"
forceDaemon, _ := winutil.GetPolicyString("UnattendedMode")
prefs.ForceDaemon = forceDaemon == "always"
corpDNS, _ := syspolicy.GetPreferenceOption(syspolicy.EnableTailscaleDNS)
prefs.CorpDNS = corpDNS.ShouldEnable(false)
routeAll, _ := syspolicy.GetPreferenceOption(syspolicy.EnableTailscaleSubnets)
prefs.RouteAll = routeAll.ShouldEnable(false)
return prefs.View()
}()

11
ipn/ipnlocal/profiles_windows.go
View File

@@ -13,7 +13,6 @@ import (
"tailscale.com/atomicfile"
"tailscale.com/ipn"
"tailscale.com/util/syspolicy"
"tailscale.com/util/winutil/policy"
)
@@ -71,8 +70,6 @@ func (pm *profileManager) loadLegacyPrefs() (string, ipn.PrefsView, error) {
prefs.ExitNodeIP = resolveExitNodeIP(prefs.ExitNodeIP)
prefs.ShieldsUp = resolveShieldsUp(prefs.ShieldsUp)
prefs.ForceDaemon = resolveForceDaemon(prefs.ForceDaemon)
prefs.CorpDNS, _ = resolveOptionPolicy(syspolicy.EnableTailscaleDNS, prefs.CorpDNS)
prefs.RouteAll, _ = resolveOptionPolicy(syspolicy.EnableTailscaleSubnets, prefs.RouteAll)
pm.logf("migrating Windows profile to new format")
return migrationSentinel, prefs.View(), nil
@@ -91,11 +88,3 @@ func resolveForceDaemon(defval bool) bool {
pol := policy.GetPreferenceOptionPolicy("UnattendedMode")
return pol.ShouldEnable(defval)
}
func resolveOptionPolicy(key syspolicy.Key, defval bool) (bool, error) {
pol, err := syspolicy.GetPreferenceOption(key)
if err != nil {
return defval, err
}
return pol.ShouldEnable(defval), nil
}