projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ab583f7
)
Ensure tinc-gui running in 64 bits mode can find tinc's 32 bit registry key.
author
Dennis Joachimsthaler
<dennis@efjot.de>
Fri, 17 Jan 2014 17:15:40 +0000
(18:15 +0100)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 17 Jan 2014 17:15:40 +0000
(18:15 +0100)
gui/tinc-gui
patch
|
blob
|
history
diff --git
a/gui/tinc-gui
b/gui/tinc-gui
index
64b738e
..
24ca96e
100755
(executable)
--- a/
gui/tinc-gui
+++ b/
gui/tinc-gui
@@
-234,9
+234,15
@@
class VPN:
def __init__(self, netname = None, pidfile = None):
if platform.system() == 'Windows':
def __init__(self, netname = None, pidfile = None):
if platform.system() == 'Windows':
+ sam = _winreg.KEY_READ
+ if platform.machine().endswith('64'):
+ sam = sam | _winreg.KEY_WOW64_64KEY
try:
reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
try:
reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
- key = _winreg.OpenKey(reg, "SOFTWARE\\tinc")
+ try:
+ key = _winreg.OpenKey(reg, "SOFTWARE\\tinc", 0, sam)
+ except WindowsError:
+ key = _winreg.OpenKey(reg, "SOFTWARE\\Wow6432Node\\tinc", 0, sam)
VPN.confdir = _winreg.QueryValue(key, None)
except WindowsError:
pass
VPN.confdir = _winreg.QueryValue(key, None)
except WindowsError:
pass