gpo: Pass necessary parameters to rsop

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>

diff --git a/python/samba/gpclass.py b/python/samba/gpclass.py
index 243f917e2011697a14830952099da4749a41021f..8e9bfb9f0e33bbb7bac1f1e499e4d19edd46280d 100644 (file)
--- a/python/samba/gpclass.py
+++ b/python/samba/gpclass.py
@@ -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)

diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo
deleted file mode 100644 (file)
index b1c8285..0000000
--- a/selftest/knownfail.d/gpo
+++ /dev/null
@@ -1 +0,0 @@
-samba.tests.gpo.samba.tests.gpo.GPOTests.test_rsop

diff --git a/source4/scripting/bin/samba-gpupdate b/source4/scripting/bin/samba-gpupdate
index 44292ec644fc97112c7054103592f32226137f37..dfbb1901457dae426d6c2dfca1ef0a3132da05db 100755 (executable)
--- a/source4/scripting/bin/samba-gpupdate
+++ b/source4/scripting/bin/samba-gpupdate
@@ -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: