sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

gpo: Calculate deleted gpos and unapply them

Browse Source 
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
This commit is contained in:
David Mulder 2018-05-15 14:00:07 -06:00 committed by Aurélien Aptel
parent 30f6ac9c16
commit cab1650539
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/samba/gpclass.py
View File

@ -460,6 +460,12 @@ def check_refresh_gpo_list(dc_hostname, lp, creds, gpos):
cache_gpo_dir(conn, cache_path, check_safe_path(gpo.file_sys_path))
def get_deleted_gpos_list(gp_db, gpos):
applied_gpos = gp_db.get_applied_guids()
current_guids = set([p.name for p in gpos])
deleted_gpos = [guid for guid in applied_gpos if guid not in current_guids]
return gp_db.get_applied_settings(deleted_gpos)
def gpo_version(lp, path):
# gpo.gpo_get_sysvol_gpt_version() reads the GPT.INI from a local file,
# read from the gpo client cache.
@ -471,6 +477,7 @@ def apply_gp(lp, creds, logger, store, gp_extensions):
gp_db = store.get_gplog(creds.get_username())
dc_hostname = get_dc_hostname(creds, lp)
gpos = get_gpo_list(dc_hostname, creds, lp)
del_gpos = get_deleted_gpos_list(gp_db, gpos)
try:
check_refresh_gpo_list(dc_hostname, lp, creds, gpos)
except:
@ -492,7 +499,7 @@ def apply_gp(lp, creds, logger, store, gp_extensions):
store.start()
for ext in gp_extensions:
try:
ext.process_group_policy([], changed_gpos)
ext.process_group_policy(del_gpos, changed_gpos)
except Exception as e:
logger.error('Failed to apply extension %s' % str(ext))
logger.error('Message was: ' + str(e))