saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cast vdata to it's proper type

Browse source
This commit is contained in:
twangboy 2017-10-19 18:42:29 -06:00
parent a66cd67d15
commit 03fa37b445
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/modules/reg.py
View file

@ -138,7 +138,8 @@ class Registry(object): # pylint: disable=R0903
'REG_DWORD': _winreg.REG_DWORD,
'REG_EXPAND_SZ': _winreg.REG_EXPAND_SZ,
'REG_MULTI_SZ': _winreg.REG_MULTI_SZ,
'REG_SZ': _winreg.REG_SZ
'REG_SZ': _winreg.REG_SZ,
'REG_QWORD': 11 # REG_QWORD isn't in the winreg library
}
self.opttype = {
'REG_OPTION_NON_VOLATILE': _winreg.REG_OPTION_NON_VOLATILE,
@ -150,7 +151,8 @@ class Registry(object): # pylint: disable=R0903
_winreg.REG_DWORD: 'REG_DWORD',
_winreg.REG_EXPAND_SZ: 'REG_EXPAND_SZ',
_winreg.REG_MULTI_SZ: 'REG_MULTI_SZ',
_winreg.REG_SZ: 'REG_SZ'
_winreg.REG_SZ: 'REG_SZ',
11: 'REG_QWORD' # REG_QWORD isn't in the winreg library
}
self.opttype_reverse = {
_winreg.REG_OPTION_NON_VOLATILE: 'REG_OPTION_NON_VOLATILE',
@ -577,6 +579,18 @@ def set_value(hive,
hkey = registry.hkeys[local_hive]
vtype_value = registry.vtype[local_vtype]
access_mask = registry.registry_32[use_32bit_registry] | _winreg.KEY_ALL_ACCESS
# Check data type and cast to expected type
# int will automatically become long on 64bit numbers
# https://www.python.org/dev/peps/pep-0237/
reg_type = {1: str, # REG_SZ
2: str, # REG_EXPAND_SZ
3: bin, # REG_BINARY
4: int, # REG_DWORD
7: list, # REG_MULTI_SZ
11: int} # REG_QWORD (unsupported)
local_vdata = reg_type[vtype_value](local_vdata)
if volatile:
create_options = registry.opttype['REG_OPTION_VOLATILE']
else: