diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-06-13 11:59:23 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-06-13 11:59:23 +0200 |
commit | 67ae92e3e72bcd61224d638258d47569101435f6 (patch) | |
tree | 134b8513ae049604eaf1f032e28c6771b4fa212b /installer | |
parent | version: bump (diff) | |
download | wireguard-windows-67ae92e3e72bcd61224d638258d47569101435f6.tar.xz wireguard-windows-67ae92e3e72bcd61224d638258d47569101435f6.zip |
installer: remove sidtype compat code
Diffstat (limited to 'installer')
-rw-r--r-- | installer/customactions.js | 17 | ||||
-rw-r--r-- | installer/wireguard.wxs | 8 |
2 files changed, 0 insertions, 25 deletions
diff --git a/installer/customactions.js b/installer/customactions.js index a7ebc95d..c35774ad 100644 --- a/installer/customactions.js +++ b/installer/customactions.js @@ -100,20 +100,3 @@ function RemoveConfigFolder() { logMessage("Failed to remove configuration on uninstall: " + e.message); } } - -/* TODO: Remove me no later than July 2019. This is so that pre-0.0.9 upgrades go smoothly. */ -function REMOVEME_EnableServiceSidType() { - var serviceKey = "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Services"; - var servicePrefix = "WireGuardTunnel$"; - var serviceKeyPrefix = serviceKey + "\\" + servicePrefix; - var allowedNameFormat = new RegExp("^[a-zA-Z0-9_=+.-]{1,32}$"); - var txt = runWithNoWindowFlash(fso.BuildPath(fso.GetSpecialFolder(1), "reg.exe") + " query \"" + serviceKey + "\""); - var lines = txt.split(new RegExp("\r?\n", "g")); - for (var i = 0; i < lines.length; ++i) { - if (lines[i].length > serviceKeyPrefix.length && lines[i].substring(0, serviceKeyPrefix.length) == serviceKeyPrefix) { - var tunnelName = lines[i].substring(serviceKeyPrefix.length); - if (tunnelName.match(allowedNameFormat) != null) - wsh.Run(fso.BuildPath(fso.GetSpecialFolder(1), "sc.exe") + " sidtype " + servicePrefix + tunnelName + " unrestricted", 0, true); - } - } -} diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs index 5680567b..12fcb585 100644 --- a/installer/wireguard.wxs +++ b/installer/wireguard.wxs @@ -142,13 +142,5 @@ <!-- TODO: this should not launch when msiexec is called with whatever flag means it shouldn't launch. --> <Custom Action="LaunchApplication" After="PublishProduct">NOT Installed</Custom> </InstallExecuteSequence> - - <!-- - TODO: Remove me no later than July 2019. This is so that pre-0.0.9 upgrades go smoothly. - --> - <CustomAction Id="REMOVEME_EnableServiceSidType" BinaryKey="customactions.js" JScriptCall="REMOVEME_EnableServiceSidType" Execute="deferred" Impersonate="no"/> - <InstallExecuteSequence> - <Custom Action="REMOVEME_EnableServiceSidType" After="StopServices"/> - </InstallExecuteSequence> </Product> </Wix> |