GPO: Add rsop output for smb.conf policy

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/gp_smb_conf_ext.py b/python/samba/gp_smb_conf_ext.py
index a67c7ea1278ae71853fe083810cf5163368c003c..5461e0d9b25d4fee6bdfec3b251a6de7be4a9e34 100644 (file)
--- a/python/samba/gp_smb_conf_ext.py
+++ b/python/samba/gp_smb_conf_ext.py
@@ -83,3 +83,20 @@ class gp_smb_conf_ext(gp_pol_ext):
 
     def __str__(self):
         return "smb.conf"
+
+    def rsop(self, gpo):
+        output = {}
+        if gpo.file_sys_path:
+            section_name = 'Software\\Policies\\Samba\\smb_conf'
+            pol_file = 'MACHINE/Registry.pol'
+            path = os.path.join(gpo.file_sys_path, pol_file)
+            pol_conf = self.parse(path)
+            if not pol_conf:
+                return output
+            for e in pol_conf.entries:
+                if not e.keyname.startswith(section_name):
+                    continue
+                if 'smb.conf' not in output.keys():
+                    output['smb.conf'] = {}
+                output['smb.conf'][e.valuename] = e.data
+        return output

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