lib/smbconf: add delete_global_parameter method to SMBConf

Add a delete_global_parameter method wrapping smbconf_delete_global_parameter.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/lib/smbconf/pysmbconf.c b/lib/smbconf/pysmbconf.c
index fe5c1558d9868a06afa80786d0ae854d7ed0cca7..6edca974ccdcf144688b4ecc6a518947eefc55b6 100644 (file)
--- a/lib/smbconf/pysmbconf.c
+++ b/lib/smbconf/pysmbconf.c
@@ -500,6 +500,24 @@ static PyObject *obj_delete_parameter(py_SMBConf_Object * self, PyObject * args)
        Py_RETURN_NONE;
 }
 
+static PyObject *obj_delete_global_parameter(py_SMBConf_Object * self,
+                                            PyObject * args)
+{
+       sbcErr err;
+       char *param_name = NULL;
+
+       if (!PyArg_ParseTuple(args, "s", &param_name)) {
+               return NULL;
+       }
+
+       err = smbconf_delete_global_parameter(self->conf_ctx, param_name);
+       if (err != SBC_ERR_OK) {
+               py_raise_SMBConfError(err);
+               return NULL;
+       }
+       Py_RETURN_NONE;
+}
+
 PyDoc_STRVAR(obj_requires_messaging_doc,
 "requires_messaging() -> bool\n"
 "\n"
@@ -561,6 +579,10 @@ PyDoc_STRVAR(obj_delete_parameter_doc,
 "delete_parameter(str, str) -> None\n"
 "Delete a single configuration parameter.\n");
 
+PyDoc_STRVAR(obj_delete_global_parameter_doc,
+"delete_parameter(str, str) -> None\n"
+"Delete a single global configuration parameter.\n");
+
 static PyMethodDef py_smbconf_obj_methods[] = {
        { "requires_messaging", (PyCFunction) obj_requires_messaging,
         METH_NOARGS, obj_requires_messaging_doc },
@@ -586,6 +608,8 @@ static PyMethodDef py_smbconf_obj_methods[] = {
         obj_delete_share_doc },
        { "delete_parameter", (PyCFunction) obj_delete_parameter, METH_VARARGS,
         obj_delete_parameter_doc },
+       { "delete_global_parameter", (PyCFunction) obj_delete_global_parameter,
+        METH_VARARGS, obj_delete_global_parameter_doc },
        { 0 },
 };
 

diff --git a/python/samba/tests/smbconf.py b/python/samba/tests/smbconf.py
index 53912d7a0803a5931c81a8c4f3b8818138c11112..cebad7fba11228eb2c3574c8bb72c0847e8d2555 100644 (file)
--- a/python/samba/tests/smbconf.py
+++ b/python/samba/tests/smbconf.py
@@ -234,6 +234,31 @@ class SMBConfTests(samba.tests.TestCase):
             ),
         )
 
+    def test_delete_global_parameter(self):
+        sconf = self.s3smbconf.init_reg(None)
+        sconf.drop()
+        sconf.set_global_parameter("workgroup", "EXAMPLE")
+        sconf.set_global_parameter("client min protocol", "NT1")
+        sconf.set_global_parameter("server min protocol", "SMB2")
+
+        s1 = sconf.get_share("global")
+        self.assertEqual(
+            s1,
+            (
+                "global",
+                [
+                    ("workgroup", "EXAMPLE"),
+                    ("client min protocol", "NT1"),
+                    ("server min protocol", "SMB2"),
+                ],
+            ),
+        )
+
+        sconf.delete_global_parameter("server min protocol")
+        sconf.delete_global_parameter("client min protocol")
+        s1 = sconf.get_share("global")
+        self.assertEqual(s1, ("global", [("workgroup", "EXAMPLE")]))
+
 
 if __name__ == "__main__":
     import unittest