aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ringlogger
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-06-12 16:30:34 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-06-12 16:40:33 +0200
commit09d42461a071d0cae9eeb417264b1260883f96de (patch)
tree320acd8804f412fc359f70b27aaeaa1511b66994 /ringlogger
parentmod: bump wireguard-go (diff)
downloadwireguard-windows-jd/programdata.tar.xz
wireguard-windows-jd/programdata.zip
conf: move to C:\ProgramDatajd/programdata
It's not deleted after OS upgrades.
Diffstat (limited to 'ringlogger')
-rw-r--r--ringlogger/dump_windows.go30
1 files changed, 6 insertions, 24 deletions
diff --git a/ringlogger/dump_windows.go b/ringlogger/dump_windows.go
index 552410e5..00810ab5 100644
--- a/ringlogger/dump_windows.go
+++ b/ringlogger/dump_windows.go
@@ -11,35 +11,17 @@ import (
"path/filepath"
"golang.org/x/sys/windows"
- "golang.org/x/sys/windows/registry"
+
"golang.zx2c4.com/wireguard/windows/conf"
)
-func DumpTo(out io.Writer, localSystem bool) error {
+func DumpTo(out io.Writer) error {
var path string
- if !localSystem {
- root, err := conf.RootDirectory()
- if err != nil {
- return err
- }
- path = filepath.Join(root, "log.bin")
- } else {
- k, err := registry.OpenKey(registry.LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\S-1-5-18", registry.QUERY_VALUE)
- if err != nil {
- return err
- }
- defer k.Close()
-
- systemprofile, _, err := k.GetStringValue("ProfileImagePath")
- if err != nil {
- return err
- }
- systemprofile, err = registry.ExpandString(systemprofile)
- if err != nil {
- return err
- }
- path = filepath.Join(systemprofile, "AppData", "Local", "WireGuard", "log.bin")
+ root, err := conf.RootDirectory()
+ if err != nil {
+ return err
}
+ path = filepath.Join(root, "log.bin")
file, err := os.Open(path)
if err != nil {
return err