From c3a5489e7270aad551044f176b324f97258e48d8 Mon Sep 17 00:00:00 2001
From: Adrian Dewhurst <adrian@tailscale.com>
Date: Thu, 3 Nov 2022 13:34:13 -0400
Subject: [PATCH] util/winutil: remove log spam for missing registry keys

It's normal for HKLM\SOFTWARE\Policies\Tailscale to not exist but that
currently produces a lot of log spam.

Signed-off-by: Adrian Dewhurst <adrian@tailscale.com>
---
 util/winutil/winutil_windows.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/util/winutil/winutil_windows.go b/util/winutil/winutil_windows.go
index 210d7ef02..819104f76 100644
--- a/util/winutil/winutil_windows.go
+++ b/util/winutil/winutil_windows.go
@@ -82,7 +82,9 @@ func getRegInteger(name string, defval uint64) uint64 {
 func getRegStringInternal(subKey, name string) (string, error) {
 	key, err := registry.OpenKey(registry.LOCAL_MACHINE, subKey, registry.READ)
 	if err != nil {
-		log.Printf("registry.OpenKey(%v): %v", subKey, err)
+		if err != registry.ErrNotExist {
+			log.Printf("registry.OpenKey(%v): %v", subKey, err)
+		}
 		return "", err
 	}
 	defer key.Close()
@@ -110,7 +112,9 @@ func GetRegStrings(name string, defval []string) []string {
 func getRegStringsInternal(subKey, name string) ([]string, error) {
 	key, err := registry.OpenKey(registry.LOCAL_MACHINE, subKey, registry.READ)
 	if err != nil {
-		log.Printf("registry.OpenKey(%v): %v", subKey, err)
+		if err != registry.ErrNotExist {
+			log.Printf("registry.OpenKey(%v): %v", subKey, err)
+		}
 		return nil, err
 	}
 	defer key.Close()
@@ -148,6 +152,9 @@ func DeleteRegValue(name string) error {
 
 func deleteRegValueInternal(subKey, name string) error {
 	key, err := registry.OpenKey(registry.LOCAL_MACHINE, subKey, registry.SET_VALUE)
+	if err == registry.ErrNotExist {
+		return nil
+	}
 	if err != nil {
 		log.Printf("registry.OpenKey(%v): %v", subKey, err)
 		return err
@@ -164,7 +171,9 @@ func deleteRegValueInternal(subKey, name string) error {
 func getRegIntegerInternal(subKey, name string) (uint64, error) {
 	key, err := registry.OpenKey(registry.LOCAL_MACHINE, subKey, registry.READ)
 	if err != nil {
-		log.Printf("registry.OpenKey(%v): %v", subKey, err)
+		if err == registry.ErrNotExist {
+			log.Printf("registry.OpenKey(%v): %v", subKey, err)
+		}
 		return 0, err
 	}
 	defer key.Close()