1
0
mirror of https://github.com/altlinux/gpupdate.git synced 2025-03-21 18:50:38 +03:00

Adding forwarding policy_name and username to load_preg_dconf

This commit is contained in:
Valery Sinelnikov 2024-02-07 12:21:48 +04:00
parent a4a79d8c99
commit c8b0927090

View File

@ -81,9 +81,12 @@ def preg_keymap(preg):
return keymap
def merge_polfile(preg, sid=None, reg_name='registry', reg_path=None, policy_name='Unknown'):
def merge_polfile(preg, sid=None, reg_name='registry', reg_path=None, policy_name='Unknown', username='Machine'):
pregfile = load_preg(preg)
load_preg_dconf(pregfile, preg)
if sid is None and username == 'Machine':
load_preg_dconf(pregfile, preg, policy_name, None)
else:
load_preg_dconf(pregfile, preg, policy_name, username)
logdata = dict({'pregfile': preg})
log('D32', logdata)
#log dconf