public/gpupdate
1
0
Fork 1
mirror of https://github.com/altlinux/gpupdate.git synced 2025-03-21 18:50:38 +03:00
Code Releases Wiki Activity

Changes to the data source in the registry

Browse Source
This commit is contained in:
Valery Sinelnikov 2023-10-12 15:22:07 +04:00
parent a0d9dc585f
commit 3baffeb12d
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gpoa/backend/nodomain_backend.py
View File

@ -35,7 +35,7 @@ class nodomain_backend(applier_backend):
domain = None
machine_name = get_machine_name()
machine_sid = get_sid(domain, machine_name, True)
self.storage = registry_factory('registry')
self.storage = registry_factory()
self.storage.set_info('domain', domain)
self.storage.set_info('machine_name', machine_name)
self.storage.set_info('machine_sid', machine_sid)

2
gpoa/backend/samba_backend.py
View File

@ -46,7 +46,7 @@ class samba_backend(applier_backend):
self.__kinit_successful = machine_kinit(self.cache_path)
if not self.__kinit_successful:
raise Exception('kinit is not successful')
self.storage = registry_factory('registry')
self.storage = registry_factory()
self.storage.set_info('domain', domain)
machine_name = get_machine_name()
machine_sid = get_sid(domain, machine_name, is_machine)

2
gpoa/frontend/frontend_manager.py
View File

@ -128,7 +128,7 @@ class frontend_manager:
'''
def __init__(self, username, is_machine):
self.storage = registry_factory('registry')
self.storage = registry_factory('dconf', username=username, is_machine=is_machine)
self.username = determine_username(username)
self.is_machine = is_machine
self.process_uname = get_process_user()

8
gpoa/storage/__init__.py
View File

@ -18,10 +18,16 @@
from .sqlite_registry import sqlite_registry
from .sqlite_cache import sqlite_cache
from storage.dconf_registry import Dconf_registry
def cache_factory(cache_name):
return sqlite_cache(cache_name)
def registry_factory(registry_name='registry', registry_dir=None):
def registry_factory(registry_name='dconf', registry_dir=None, username=None, is_machine=None):
if username and registry_name == 'dconf':
return Dconf_registry(username, is_machine)
elif registry_name == 'dconf':
return Dconf_registry
return sqlite_registry(registry_name, registry_dir)

1
gpoa/util/preg.py
View File

@ -86,6 +86,7 @@ def merge_polfile(preg, sid=None, reg_name='registry', reg_path=None, policy_nam
load_preg_dconf(pregfile, preg)
logdata = dict({'pregfile': preg})
log('D32', logdata)
return
storage = registry_factory(reg_name, reg_path)
for entry in pregfile.entries:
if not sid: