From: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Date: Sun, 15 Jun 2025 23:51:14 +0000 (+1200)
Subject: ldb: Do not return None from __str__()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d7052278ba59edf3aa9283985733d107133072b;p=thirdparty%2Fsamba.git

ldb: Do not return None from __str__()

Python will complain with “__str__ returned non-string (type NoneType)”.

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index 9acea901558..c0b63285017 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -3717,7 +3717,7 @@ static PyObject *py_ldb_msg_element_str(PyLdbMessageElementObject *self)
 	if (el->num_values == 1)
 		return PyUnicode_FromStringAndSize((char *)el->values[0].data, el->values[0].length);
 	else
-		Py_RETURN_NONE;
+		return PyUnicode_FromString("");
 }
 
 static void py_ldb_msg_element_dealloc(PyLdbMessageElementObject *self)