From ffd492c9bddb3e41dc2e43399bbfa469740e9311 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 6 Jun 2019 18:39:07 +0200
Subject: manager: set sidtype using upstream method

---
 manager/install.go | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'manager')

diff --git a/manager/install.go b/manager/install.go
index 076f33b3..69a9ad3c 100644
--- a/manager/install.go
+++ b/manager/install.go
@@ -9,7 +9,6 @@ import (
 	"errors"
 	"os"
 	"time"
-	"unsafe"
 
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/svc"
@@ -161,19 +160,12 @@ func InstallTunnel(configPath string) error {
 		ErrorControl: mgr.ErrorNormal,
 		Dependencies: []string{"Nsi"},
 		DisplayName:  "WireGuard Tunnel: " + name,
+		SidType:      windows.SERVICE_SID_TYPE_UNRESTRICTED,
 	}
-
 	service, err = m.CreateService(serviceName, path, config, "/tunnelservice", configPath)
 	if err != nil {
 		return err
 	}
-	sidType := uint32(windows.SERVICE_SID_TYPE_UNRESTRICTED)
-	err = windows.ChangeServiceConfig2(service.Handle, windows.SERVICE_CONFIG_SERVICE_SID_INFO, (*byte)(unsafe.Pointer(&sidType)))
-	if err != nil {
-		service.Delete()
-		service.Close()
-		return err
-	}
 
 	err = service.Start()
 	go trackTunnelService(name, service) // Pass off reference to handle.
-- 
cgit v1.2.3-59-g8ed1b