pyldb: py_ldb_dn_add_base() uses PyErr_LDB_DN_OR_RAISE
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Thu, 14 Mar 2024 04:24:48 +0000 (17:24 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 10 Apr 2024 05:13:32 +0000 (05:13 +0000)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
lib/ldb/pyldb.c

index 47b659fc4f465c2b4c0a46e7e8375ca0a834506d..3786ca284a7c71a98fd5ef6bc2df8ada87e1e587 100644 (file)
@@ -695,16 +695,18 @@ static PyObject *py_ldb_dn_add_child(PyObject *self, PyObject *args)
        Py_RETURN_TRUE;
 }
 
-static PyObject *py_ldb_dn_add_base(PyLdbDnObject *self, PyObject *args)
+static PyObject *py_ldb_dn_add_base(PyObject *self, PyObject *args)
 {
        PyObject *py_other;
-       struct ldb_dn *other, *dn;
+       struct ldb_dn *other = NULL;
+       struct ldb_dn *dn = NULL;
        bool ok;
+
+       PyErr_LDB_DN_OR_RAISE(self, dn);
+
        if (!PyArg_ParseTuple(args, "O", &py_other))
                return NULL;
 
-       dn = pyldb_Dn_AS_DN((PyObject *)self);
-
        if (!pyldb_Object_AsDn(NULL, py_other, ldb_dn_get_ldb_context(dn), &other))
                return NULL;