sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

gpo: Pass necessary parameters to rsop

Browse Source 
These parameters were missed by mistake when exts
were modified to be initialized within the rsop
command. Fixes an exception thrown when executing
samba-gpupdate --rsop:

Traceback (most recent call last):
  File "/usr/sbin/samba-gpupdate", line 99, in <module>
    rsop(lp, creds, gp_extensions, opts.target)
  File "/usr/lib64/python3.8/site-packages/samba/gpclass.py", line 512, in rsop
    ext = ext(logger, lp, creds, store)
NameError: name 'logger' is not defined

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
David Mulder 2020-08-27 13:25:44 -06:00 committed by Jeremy Allison
parent dff01a5edf
commit 11f97148bb
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/gpclass.py
View File

@ -497,7 +497,7 @@ def __rsop_vals(vals, level=4):
else:
return vals
def rsop(lp, creds, gp_extensions, target):
def rsop(lp, creds, logger, store, gp_extensions, target):
dc_hostname = get_dc_hostname(creds, lp)
gpos = get_gpo_list(dc_hostname, creds, lp)
check_refresh_gpo_list(dc_hostname, lp, creds, gpos)

1
selftest/knownfail.d/gpo
View File

@ -1 +0,0 @@
samba.tests.gpo.samba.tests.gpo.GPOTests.test_rsop

2
source4/scripting/bin/samba-gpupdate
View File

@ -96,7 +96,7 @@ if __name__ == "__main__":
gp_extensions.extend(user_exts)
if opts.rsop:
rsop(lp, creds, gp_extensions, opts.target)
rsop(lp, creds, logger, store, gp_extensions, opts.target)
elif not opts.unapply:
apply_gp(lp, creds, logger, store, gp_extensions, opts.force)
else: