From: Kamen Mazdrashki <kamenim@samba.org>
Date: Fri, 9 Jul 2010 03:38:11 +0000 (+0300)
Subject: s4-pyldb: Use ldb_msg_diff_ex() in py_ldb_msg_diff()
X-Git-Url: http://git.samba.org/?p=kamenim%2Fsamba.git;a=commitdiff_plain;h=dbf121e7b5d85df724aea5675b61fc8f53e6e1d9

s4-pyldb: Use ldb_msg_diff_ex() in py_ldb_msg_diff()
---

diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index b886a4b81c..925ea5232a 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -1035,9 +1035,11 @@ static PyObject *py_ldb_parse_ldif(PyLdbObject *self, PyObject *args)
 
 static PyObject *py_ldb_msg_diff(PyLdbObject *self, PyObject *args)
 {
+	int ldb_ret;
 	PyObject *py_msg_old;
 	PyObject *py_msg_new;
 	struct ldb_message *diff;
+	struct ldb_context *ldb;
 	PyObject *py_ret;
 
 	if (!PyArg_ParseTuple(args, "OO", &py_msg_old, &py_msg_new))
@@ -1053,14 +1055,20 @@ static PyObject *py_ldb_msg_diff(PyLdbObject *self, PyObject *args)
 		return NULL;
 	}
 
-	diff = ldb_msg_diff(PyLdb_AsLdbContext(self), PyLdbMessage_AsMessage(py_msg_old), PyLdbMessage_AsMessage(py_msg_new));
-	if (!diff) {
+	ldb = PyLdb_AsLdbContext(self);
+	ldb_ret = ldb_msg_diff_ex(ldb,
+	                          PyLdbMessage_AsMessage(py_msg_old),
+	                          PyLdbMessage_AsMessage(py_msg_new),
+	                          (TALLOC_CTX*)ldb, &diff);
+	if (ldb_ret != LDB_SUCCESS) {
 		PyErr_SetString(PyExc_RuntimeError, "Failed to generate the Ldb Message diff");
 		return NULL;
 	}
 
 	py_ret = PyLdbMessage_FromMessage(diff);
 
+	talloc_unlink(ldb, diff);
+
 	return py_ret;
 }