From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 4 Dec 2023 21:30:50 +0000 (+1300)
Subject: dns: Use pyldb_Ldb_AsLdbContext() in PyErr_LDB_OR_RAISE()
X-Git-Tag: tdb-1.4.11~1541
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0839999c94838d7d7624be35e8da7dc55100423a;p=thirdparty%2Fsamba.git

dns: Use pyldb_Ldb_AsLdbContext() in PyErr_LDB_OR_RAISE()

This prepares to move this macro into pyldb.h

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/source4/dns_server/pydns.c b/source4/dns_server/pydns.c
index 6e99ebd6479..96151df9771 100644
--- a/source4/dns_server/pydns.c
+++ b/source4/dns_server/pydns.c
@@ -33,11 +33,11 @@
 
 /* FIXME: These should be in a header file somewhere */
 #define PyErr_LDB_OR_RAISE(py_ldb, ldb) \
-	if (!py_check_dcerpc_type(py_ldb, "ldb", "Ldb")) { \
+	ldb = pyldb_Ldb_AsLdbContext(py_ldb); \
+	if (!ldb) { \
 		PyErr_SetString(PyExc_TypeError, "Ldb connection object required"); \
 		return NULL; \
-	} \
-	ldb = pyldb_Ldb_AsLdbContext(py_ldb);
+	}
 
 #define PyErr_LDB_DN_OR_RAISE(py_ldb_dn, dn) \
 	if (!py_check_dcerpc_type(py_ldb_dn, "ldb", "Dn")) { \