Attachment 16880 Details for Bug 14848 – patch backported to 4.13 (only)

[patch] patch backported to 4.13 (only)

ldb-2.2.2-for-samba-4.13.patch (text/plain), 50.61 KB, created by Andrew Bartlett on 2021-10-27 23:07:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2021-10-27 23:07:06 UTC

Size: 50.61 KB

patch

obsolete

>From 0b95900ddd3d794f8a289640897eddffaade5a75 Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Mon, 13 Sep 2021 11:34:56 +1200
>Subject: [PATCH 01/14] pytest:segfault: Add test for ldb.msg_diff()
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14645
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14836
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>
>[abartlet@samba.org backported form from commit
>a99a76722d6046a5d63032e3d2bb3f791da948a6 due to conflicts
>with other new segfault tests]
>---
> python/samba/tests/segfault.py        | 11 +++++++++++
> selftest/knownfail.d/python-segfaults |  1 +
> 2 files changed, 12 insertions(+)
>
>diff --git a/python/samba/tests/segfault.py b/python/samba/tests/segfault.py
>index 07e2d46d56a..eac314982a8 100644
>--- a/python/samba/tests/segfault.py
>+++ b/python/samba/tests/segfault.py
>@@ -174,3 +174,14 @@ class SegfaultTests(samba.tests.TestCase):
>     def test_dcerpc_idl_inline_arrays(self):
>         """Inline arrays were incorrectly handled."""
>         dnsserver.DNS_RPC_SERVER_INFO_DOTNET().pExtensions
>+
>+    @segfault_detector
>+    def test_ldb_msg_diff(self):
>+        samdb = self.get_samdb()
>+
>+        msg = ldb.Message()
>+        msg.dn = ldb.Dn(samdb, '')
>+        diff = samdb.msg_diff(msg, msg)
>+
>+        del msg
>+        diff.dn
>diff --git a/selftest/knownfail.d/python-segfaults b/selftest/knownfail.d/python-segfaults
>index 1be0566dcb1..b7229fc7229 100644
>--- a/selftest/knownfail.d/python-segfaults
>+++ b/selftest/knownfail.d/python-segfaults
>@@ -1 +1,2 @@
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_net_replicate_init__3
>+samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_ldb_msg_diff
>-- 
>2.25.1
>
>
>From d44fc645ac77f4334ccb6034078d92447bc1edbf Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Tue, 14 Sep 2021 11:08:41 +1200
>Subject: [PATCH 02/14] ldb_msg: Don't fail in ldb_msg_copy() if source DN is
> NULL
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14645
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14836
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>(cherry picked from commit c2bbe774ce03661666a1f48922a9ab681ef4f64b)
>---
> lib/ldb/common/ldb_msg.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c
>index 2346e66ec39..7131f013f71 100644
>--- a/lib/ldb/common/ldb_msg.c
>+++ b/lib/ldb/common/ldb_msg.c
>@@ -876,8 +876,10 @@ struct ldb_message *ldb_msg_copy(TALLOC_CTX *mem_ctx,
> 	msg2 = ldb_msg_copy_shallow(mem_ctx, msg);
> 	if (msg2 == NULL) return NULL;
> 
>-	msg2->dn = ldb_dn_copy(msg2, msg2->dn);
>-	if (msg2->dn == NULL) goto failed;
>+	if (msg2->dn != NULL) {
>+		msg2->dn = ldb_dn_copy(msg2, msg2->dn);
>+		if (msg2->dn == NULL) goto failed;
>+	}
> 
> 	for (i=0;i<msg2->num_elements;i++) {
> 		struct ldb_message_element *el = &msg2->elements[i];
>-- 
>2.25.1
>
>
>From bd6dee3fe34669eaa5e251b173277f1193845632 Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Mon, 13 Sep 2021 11:15:17 +1200
>Subject: [PATCH 03/14] pyldb: Avoid use-after-free in msg_diff()
>
>Make a deep copy of the message elements in msg_diff() so that if either
>of the input messages are deallocated early, the result does not refer
>to non-existing elements.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14645
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14836
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>
>[abartlet@samba.org backported from commit
> 19a2af02f57d99db8ed3c6b028c3abdf4b553700 due to conflicts in
> the knownfail.d/python-segfaults file]
>
>Autobuild-User(v4-14-test): Jule Anger <janger@samba.org>
>Autobuild-Date(v4-14-test): Wed Sep 29 13:14:22 UTC 2021 on sn-devel-184
>---
> lib/ldb/pyldb.c                       | 18 ++++++++++++++++--
> selftest/knownfail.d/python-segfaults |  1 -
> 2 files changed, 16 insertions(+), 3 deletions(-)
>
>diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
>index 813cdb0870e..443b677c2c4 100644
>--- a/lib/ldb/pyldb.c
>+++ b/lib/ldb/pyldb.c
>@@ -1804,6 +1804,7 @@ static PyObject *py_ldb_msg_diff(PyLdbObject *self, PyObject *args)
> 	struct ldb_message *diff;
> 	struct ldb_context *ldb;
> 	PyObject *py_ret;
>+	TALLOC_CTX *mem_ctx = NULL;
> 
> 	if (!PyArg_ParseTuple(args, "OO", &py_msg_old, &py_msg_new))
> 		return NULL;
>@@ -1818,19 +1819,32 @@ static PyObject *py_ldb_msg_diff(PyLdbObject *self, PyObject *args)
> 		return NULL;
> 	}
> 
>+	mem_ctx = talloc_new(NULL);
>+	if (mem_ctx == NULL) {
>+		PyErr_NoMemory();
>+		return NULL;
>+	}
>+
> 	ldb = pyldb_Ldb_AS_LDBCONTEXT(self);
>-	ldb_ret = ldb_msg_difference(ldb, ldb,
>+	ldb_ret = ldb_msg_difference(ldb, mem_ctx,
> 	                             pyldb_Message_AsMessage(py_msg_old),
> 	                             pyldb_Message_AsMessage(py_msg_new),
> 	                             &diff);
> 	if (ldb_ret != LDB_SUCCESS) {
>+		talloc_free(mem_ctx);
> 		PyErr_SetString(PyExc_RuntimeError, "Failed to generate the Ldb Message diff");
> 		return NULL;
> 	}
> 
>+	diff = ldb_msg_copy(mem_ctx, diff);
>+	if (diff == NULL) {
>+		PyErr_NoMemory();
>+		return NULL;
>+	}
>+
> 	py_ret = PyLdbMessage_FromMessage(diff);
> 
>-	talloc_unlink(ldb, diff);
>+	talloc_free(mem_ctx);
> 
> 	return py_ret;
> }
>diff --git a/selftest/knownfail.d/python-segfaults b/selftest/knownfail.d/python-segfaults
>index b7229fc7229..1be0566dcb1 100644
>--- a/selftest/knownfail.d/python-segfaults
>+++ b/selftest/knownfail.d/python-segfaults
>@@ -1,2 +1 @@
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_net_replicate_init__3
>-samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_ldb_msg_diff
>-- 
>2.25.1
>
>
>From 8d7fad48c51d217f5442807e9e68f4dc0408ae06 Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Wed, 28 Apr 2021 16:48:55 +1200
>Subject: [PATCH 04/14] Fix Python docstrings
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Sat Sep  4 00:55:32 UTC 2021 on sn-devel-184
>
>(cherry picked from commit 02b187303369d3ce0c19dfb72ffa78f86a3911f0)
>---
> lib/ldb/pyldb.c                  | 2 +-
> lib/tdb/pytdb.c                  | 2 +-
> lib/tevent/pytevent.c            | 2 +-
> source4/librpc/ndr/py_security.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
>index 443b677c2c4..7e86f7413c3 100644
>--- a/lib/ldb/pyldb.c
>+++ b/lib/ldb/pyldb.c
>@@ -839,7 +839,7 @@ static PyMethodDef py_ldb_dn_methods[] = {
> 		"S.get_component_value(num) -> string\n"
> 		"get the attribute value of the specified component as a binary string" },
> 	{ "set_component", (PyCFunction)py_ldb_dn_set_component, METH_VARARGS,
>-		"S.get_component_value(num, name, value) -> None\n"
>+		"S.set_component(num, name, value) -> None\n"
> 		"set the attribute name and value of the specified component" },
> 	{ "get_rdn_name", (PyCFunction)py_ldb_dn_get_rdn_name, METH_NOARGS,
> 		"S.get_rdn_name() -> string\n"
>diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
>index 2ea2042c1e5..e2f8ace227f 100644
>--- a/lib/tdb/pytdb.c
>+++ b/lib/tdb/pytdb.c
>@@ -577,7 +577,7 @@ static PyMethodDef tdb_object_methods[] = {
> 	{ "add_flags", (PyCFunction)obj_add_flags, METH_VARARGS, "S.add_flags(flags) -> None" },
> 	{ "remove_flags", (PyCFunction)obj_remove_flags, METH_VARARGS, "S.remove_flags(flags) -> None" },
> #if PY_MAJOR_VERSION >= 3
>-	{ "keys", (PyCFunction)tdb_object_iter, METH_NOARGS, "S.iterkeys() -> iterator" },
>+	{ "keys", (PyCFunction)tdb_object_iter, METH_NOARGS, "S.keys() -> iterator" },
> #else
> 	{ "iterkeys", (PyCFunction)tdb_object_iter, METH_NOARGS, "S.iterkeys() -> iterator" },
> #endif
>diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
>index 93375f71868..62dfe2419ff 100644
>--- a/lib/tevent/pytevent.c
>+++ b/lib/tevent/pytevent.c
>@@ -573,7 +573,7 @@ static PyMethodDef py_tevent_context_methods[] = {
> 	{ "add_timer", (PyCFunction)py_tevent_context_add_timer,
> 		METH_VARARGS, "S.add_timer(next_event, handler) -> timer" },
> 	{ "add_timer_offset", (PyCFunction)py_tevent_context_add_timer_offset,
>-		METH_VARARGS, "S.add_timer(offset_seconds, handler) -> timer" },
>+		METH_VARARGS, "S.add_timer_offset(offset_seconds, handler) -> timer" },
> 	{ "add_fd", (PyCFunction)py_tevent_context_add_fd, 
> 		METH_VARARGS, "S.add_fd(fd, flags, handler) -> fd" },
> 	{0},
>diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
>index d4a2cd4f6f7..cb2a26aecc4 100644
>--- a/source4/librpc/ndr/py_security.c
>+++ b/source4/librpc/ndr/py_security.c
>@@ -447,7 +447,7 @@ static PyMethodDef py_token_extra_methods[] = {
> 	{ "has_sid", (PyCFunction)py_token_has_sid, METH_VARARGS,
> 		NULL },
> 	{ "is_anonymous", (PyCFunction)py_token_is_anonymous, METH_NOARGS,
>-		"S.is_anonymus() -> bool\n"
>+		"S.is_anonymous() -> bool\n"
> 		"Check whether this is an anonymous token." },
> 	{ "is_system", (PyCFunction)py_token_is_system, METH_NOARGS,
> 		NULL },
>-- 
>2.25.1
>
>
>From 93c9fbd9e8777ea4f9586ebe6b8d78fe08cafcfd Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Sat, 25 Sep 2021 10:56:25 +1200
>Subject: [PATCH 05/14] pytest:segfault: Add test for deleting an ldb.Message
> dn
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>[abartlet@samba.org backported from commit 6a041f6a99c39632d5c32e9d53b06719c20bef2c
> as other segfaulting tests are listed in knownfail.d/python-segfaults
> and @no_gdb_backtrace is not in 4.14]
>---
> python/samba/tests/segfault.py        | 5 +++++
> selftest/knownfail.d/python-segfaults | 1 +
> 2 files changed, 6 insertions(+)
>
>diff --git a/python/samba/tests/segfault.py b/python/samba/tests/segfault.py
>index eac314982a8..24add6f3b6e 100644
>--- a/python/samba/tests/segfault.py
>+++ b/python/samba/tests/segfault.py
>@@ -185,3 +185,8 @@ class SegfaultTests(samba.tests.TestCase):
> 
>         del msg
>         diff.dn
>+
>+    @segfault_detector
>+    def test_ldb_msg_del_dn(self):
>+        msg = ldb.Message()
>+        del msg.dn
>diff --git a/selftest/knownfail.d/python-segfaults b/selftest/knownfail.d/python-segfaults
>index 1be0566dcb1..c0bd391714b 100644
>--- a/selftest/knownfail.d/python-segfaults
>+++ b/selftest/knownfail.d/python-segfaults
>@@ -1 +1,2 @@
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_net_replicate_init__3
>+samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_ldb_msg_del_dn
>-- 
>2.25.1
>
>
>From 5ebc3b6f379a9475f5fc0058a131eee7658c808b Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Sat, 25 Sep 2021 11:12:16 +1200
>Subject: [PATCH 06/14] pyldb: Fix deleting an ldb.Message dn
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>[abartlet@samba.org backported from commit d7af772de88885f46708329ff7bb5798da91d2c7
> due to conflicts in knownfail.d/python-segfaults]
>---
> lib/ldb/pyldb.c                       | 4 ++++
> selftest/knownfail.d/python-segfaults | 3 ++-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
>index 7e86f7413c3..e31d2d083bd 100644
>--- a/lib/ldb/pyldb.c
>+++ b/lib/ldb/pyldb.c
>@@ -3741,6 +3741,10 @@ static PyObject *py_ldb_msg_get_dn(PyLdbMessageObject *self, void *closure)
> static int py_ldb_msg_set_dn(PyLdbMessageObject *self, PyObject *value, void *closure)
> {
> 	struct ldb_message *msg = pyldb_Message_AsMessage(self);
>+	if (value == NULL) {
>+		PyErr_SetString(PyExc_AttributeError, "cannot delete dn");
>+		return -1;
>+	}
> 	if (!pyldb_Dn_Check(value)) {
> 		PyErr_SetString(PyExc_TypeError, "expected dn");
> 		return -1;
>diff --git a/selftest/knownfail.d/python-segfaults b/selftest/knownfail.d/python-segfaults
>index c0bd391714b..d129dab7d47 100644
>--- a/selftest/knownfail.d/python-segfaults
>+++ b/selftest/knownfail.d/python-segfaults
>@@ -1,2 +1,3 @@
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_net_replicate_init__3
>-samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_ldb_msg_del_dn
>+samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_dnsp_string_list
>+samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_dns_record
>-- 
>2.25.1
>
>
>From d8477ba94d0f52733f95e333abb53b35afaed3ba Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Sat, 25 Sep 2021 11:13:02 +1200
>Subject: [PATCH 07/14] pytest:segfault: Add test for deleting an ldb.Control
> critical flag
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>[abartlet@samba.org backported from commit b1adaa517c1237a473bdcf818523f5107df3d6b0
> as @no_gdb_backtrace is not in Samba 4.14]
>---
> python/samba/tests/segfault.py        | 7 +++++++
> selftest/knownfail.d/python-segfaults | 1 +
> 2 files changed, 8 insertions(+)
>
>diff --git a/python/samba/tests/segfault.py b/python/samba/tests/segfault.py
>index 24add6f3b6e..62b51e71794 100644
>--- a/python/samba/tests/segfault.py
>+++ b/python/samba/tests/segfault.py
>@@ -190,3 +190,10 @@ class SegfaultTests(samba.tests.TestCase):
>     def test_ldb_msg_del_dn(self):
>         msg = ldb.Message()
>         del msg.dn
>+
>+    @segfault_detector
>+    def test_ldb_control_del_critical(self):
>+        samdb = self.get_samdb()
>+
>+        c = ldb.Control(samdb, 'relax:1')
>+        del c.critical
>diff --git a/selftest/knownfail.d/python-segfaults b/selftest/knownfail.d/python-segfaults
>index d129dab7d47..0c6e52d63d4 100644
>--- a/selftest/knownfail.d/python-segfaults
>+++ b/selftest/knownfail.d/python-segfaults
>@@ -1,3 +1,4 @@
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_net_replicate_init__3
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_dnsp_string_list
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_dns_record
>+samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_ldb_control_del_critical
>-- 
>2.25.1
>
>
>From f9fa118a7eb13621957d625ca15f9697a484e55d Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Sat, 25 Sep 2021 11:16:09 +1200
>Subject: [PATCH 08/14] pyldb: Fix deleting an ldb.Control critical flag
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 9d25a21d6024c6c2f8e4634f45e3944d8acbf8b8)
>---
> lib/ldb/pyldb.c                       | 4 ++++
> selftest/knownfail.d/python-segfaults | 1 -
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
>index e31d2d083bd..ff6c1c6f1ab 100644
>--- a/lib/ldb/pyldb.c
>+++ b/lib/ldb/pyldb.c
>@@ -182,6 +182,10 @@ static PyObject *py_ldb_control_get_critical(PyLdbControlObject *self,
> 
> static int py_ldb_control_set_critical(PyLdbControlObject *self, PyObject *value, void *closure)
> {
>+	if (value == NULL) {
>+		PyErr_SetString(PyExc_AttributeError, "cannot delete critical flag");
>+		return -1;
>+	}
> 	if (PyObject_IsTrue(value)) {
> 		self->data->critical = true;
> 	} else {
>diff --git a/selftest/knownfail.d/python-segfaults b/selftest/knownfail.d/python-segfaults
>index 0c6e52d63d4..d129dab7d47 100644
>--- a/selftest/knownfail.d/python-segfaults
>+++ b/selftest/knownfail.d/python-segfaults
>@@ -1,4 +1,3 @@
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_net_replicate_init__3
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_dnsp_string_list
> samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_dns_record
>-samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_ldb_control_del_critical
>-- 
>2.25.1
>
>
>From 4f364d3dad2f995bbb2e1bfa6c389f340ad1c11f Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Sat, 25 Sep 2021 19:18:39 +1200
>Subject: [PATCH 09/14] s4/torture/drs/python: Fix attribute existence check
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit fb758c32e7633178f42dc2c031667b10c2ca6e90)
>---
> source4/torture/drs/python/replica_sync.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source4/torture/drs/python/replica_sync.py b/source4/torture/drs/python/replica_sync.py
>index ad03d1b061e..62545be6fee 100644
>--- a/source4/torture/drs/python/replica_sync.py
>+++ b/source4/torture/drs/python/replica_sync.py
>@@ -140,7 +140,7 @@ objectClass: organizationalUnit
>         # now check properties of the user
>         name_cur = ou_cur["ou"][0]
>         self.assertEqual(ou_cur["isDeleted"][0], b"TRUE")
>-        self.assertTrue(not(b"objectCategory" in ou_cur))
>+        self.assertTrue(not("objectCategory" in ou_cur))
>         self.assertTrue(dodn in str(ou_cur["dn"]),
>                         "OU %s is deleted but it is not located under %s!" % (name_cur, dodn))
> 
>-- 
>2.25.1
>
>
>From e21ce8c1e60350fde531949c65fec1efc702cf7a Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Sat, 25 Sep 2021 13:22:05 +1200
>Subject: [PATCH 10/14] pyldb: Add test for an invalid ldb.Message index type
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit b018e51d2725a23b2fedd3058644b8021f6a6a06)
>---
> lib/ldb/tests/python/api.py | 6 ++++++
> selftest/knownfail.d/pyldb  | 1 +
> 2 files changed, 7 insertions(+)
> create mode 100644 selftest/knownfail.d/pyldb
>
>diff --git a/lib/ldb/tests/python/api.py b/lib/ldb/tests/python/api.py
>index 1d3d765e607..bcb01e15f56 100755
>--- a/lib/ldb/tests/python/api.py
>+++ b/lib/ldb/tests/python/api.py
>@@ -3056,6 +3056,12 @@ class LdbMsgTests(TestCase):
>     def test_notpresent(self):
>         self.assertRaises(KeyError, lambda: self.msg["foo"])
> 
>+    def test_invalid(self):
>+        try:
>+            self.assertRaises(TypeError, lambda: self.msg[42])
>+        except KeyError:
>+            self.fail()
>+
>     def test_del(self):
>         del self.msg["foo"]
> 
>diff --git a/selftest/knownfail.d/pyldb b/selftest/knownfail.d/pyldb
>new file mode 100644
>index 00000000000..8d24c4515d3
>--- /dev/null
>+++ b/selftest/knownfail.d/pyldb
>@@ -0,0 +1 @@
>+^ldb.python.api.LdbMsgTests.test_invalid
>-- 
>2.25.1
>
>
>From b49f18cc4d0c689f26d61f8bdaaaace635853e1a Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Sat, 25 Sep 2021 13:39:56 +1200
>Subject: [PATCH 11/14] pyldb: Raise TypeError for an invalid ldb.Message index
>
>Previously, a TypeError was raised and subsequently overridden by a
>KeyError.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 22353767ca75af9d9e8fa1e7da372dcb5eddfcb7)
>---
> lib/ldb/pyldb.c            | 22 +++++++---------------
> selftest/knownfail.d/pyldb |  1 -
> 2 files changed, 7 insertions(+), 16 deletions(-)
> delete mode 100644 selftest/knownfail.d/pyldb
>
>diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
>index ff6c1c6f1ab..1b2f12adf5e 100644
>--- a/lib/ldb/pyldb.c
>+++ b/lib/ldb/pyldb.c
>@@ -3433,33 +3433,25 @@ static PyObject *py_ldb_msg_keys(PyLdbMessageObject *self,
> 	return obj;
> }
> 
>-static PyObject *py_ldb_msg_getitem_helper(PyLdbMessageObject *self, PyObject *py_name)
>+static PyObject *py_ldb_msg_getitem(PyLdbMessageObject *self, PyObject *py_name)
> {
>-	struct ldb_message_element *el;
>-	const char *name;
>+	struct ldb_message_element *el = NULL;
>+	const char *name = NULL;
> 	struct ldb_message *msg = pyldb_Message_AsMessage(self);
> 	name = PyUnicode_AsUTF8(py_name);
> 	if (name == NULL) {
>-		PyErr_SetNone(PyExc_TypeError);
> 		return NULL;
> 	}
>-	if (!ldb_attr_cmp(name, "dn"))
>+	if (!ldb_attr_cmp(name, "dn")) {
> 		return pyldb_Dn_FromDn(msg->dn);
>+	}
> 	el = ldb_msg_find_element(msg, name);
> 	if (el == NULL) {
>-		return NULL;
>-	}
>-	return (PyObject *)PyLdbMessageElement_FromMessageElement(el, msg->elements);
>-}
>-
>-static PyObject *py_ldb_msg_getitem(PyLdbMessageObject *self, PyObject *py_name)
>-{
>-	PyObject *ret = py_ldb_msg_getitem_helper(self, py_name);
>-	if (ret == NULL) {
> 		PyErr_SetString(PyExc_KeyError, "No such element");
> 		return NULL;
> 	}
>-	return ret;
>+
>+	return PyLdbMessageElement_FromMessageElement(el, msg->elements);
> }
> 
> static PyObject *py_ldb_msg_get(PyLdbMessageObject *self, PyObject *args, PyObject *kwargs)
>diff --git a/selftest/knownfail.d/pyldb b/selftest/knownfail.d/pyldb
>deleted file mode 100644
>index 8d24c4515d3..00000000000
>--- a/selftest/knownfail.d/pyldb
>+++ /dev/null
>@@ -1 +0,0 @@
>-^ldb.python.api.LdbMsgTests.test_invalid
>-- 
>2.25.1
>
>
>From 48b2e618f9ab8e2f5234885fb249c3625d60e8dd Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Sat, 25 Sep 2021 13:48:57 +1200
>Subject: [PATCH 12/14] pyldb: Add tests for ldb.Message containment testing
>
>These tests verify that the 'in' operator on ldb.Message is consistent
>with indexing and the get() method. This means that the 'dn' element
>should always be present, lookups should be case-insensitive, and use of
>an invalid type should result in a TypeError.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 865fe238599a732360b77e06e592cb85d459acf8)
>---
> lib/ldb/tests/python/api.py | 23 +++++++++++++++++++++++
> selftest/knownfail.d/pyldb  |  4 ++++
> 2 files changed, 27 insertions(+)
> create mode 100644 selftest/knownfail.d/pyldb
>
>diff --git a/lib/ldb/tests/python/api.py b/lib/ldb/tests/python/api.py
>index bcb01e15f56..675b5859af8 100755
>--- a/lib/ldb/tests/python/api.py
>+++ b/lib/ldb/tests/python/api.py
>@@ -3177,6 +3177,29 @@ class LdbMsgTests(TestCase):
>     def test_get_unknown_text(self):
>         self.assertEqual(None, self.msg.text.get("lalalala"))
> 
>+    def test_contains(self):
>+        self.msg['foo'] = ['bar']
>+        self.assertIn('foo', self.msg)
>+
>+        self.msg['Foo'] = ['bar']
>+        self.assertIn('Foo', self.msg)
>+
>+    def test_contains_case(self):
>+        self.msg['foo'] = ['bar']
>+        self.assertIn('Foo', self.msg)
>+
>+        self.msg['Foo'] = ['bar']
>+        self.assertIn('foo', self.msg)
>+
>+    def test_contains_dn(self):
>+        self.assertIn('dn', self.msg)
>+
>+    def test_contains_dn_case(self):
>+        self.assertIn('DN', self.msg)
>+
>+    def test_contains_invalid(self):
>+        self.assertRaises(TypeError, lambda: None in self.msg)
>+
>     def test_msg_diff(self):
>         l = ldb.Ldb()
>         msgs = l.parse_ldif("dn: foo=bar\nfoo: bar\nbaz: do\n\ndn: foo=bar\nfoo: bar\nbaz: dont\n")
>diff --git a/selftest/knownfail.d/pyldb b/selftest/knownfail.d/pyldb
>new file mode 100644
>index 00000000000..34bdac4f682
>--- /dev/null
>+++ b/selftest/knownfail.d/pyldb
>@@ -0,0 +1,4 @@
>+^ldb.python.api.LdbMsgTests.test_contains_case
>+^ldb.python.api.LdbMsgTests.test_contains_dn
>+^ldb.python.api.LdbMsgTests.test_contains_dn_case
>+^ldb.python.api.LdbMsgTests.test_contains_invalid
>-- 
>2.25.1
>
>
>From 084da23c27f4444b323a1b13f8d8af6d41ebabe4 Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Sat, 25 Sep 2021 14:39:59 +1200
>Subject: [PATCH 13/14] pyldb: Make ldb.Message containment testing consistent
> with indexing
>
>Previously, containment testing using the 'in' operator was handled by
>performing an equality comparison between the chosen object and each of
>the message's keys in turn. This behaviour was prone to errors due to
>not considering differences in case between otherwise equal elements, as
>the indexing operations do.
>
>Containment testing should now be more consistent with the indexing
>operations and with the get() method of ldb.Message.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 860d8902a9c502d4be83396598cf4a53c80fea69)
>---
> lib/ldb/pyldb.c            | 21 +++++++++++++++++++++
> selftest/knownfail.d/pyldb |  4 ----
> 2 files changed, 21 insertions(+), 4 deletions(-)
> delete mode 100644 selftest/knownfail.d/pyldb
>
>diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
>index 1b2f12adf5e..d093daedf5c 100644
>--- a/lib/ldb/pyldb.c
>+++ b/lib/ldb/pyldb.c
>@@ -3433,6 +3433,22 @@ static PyObject *py_ldb_msg_keys(PyLdbMessageObject *self,
> 	return obj;
> }
> 
>+static int py_ldb_msg_contains(PyLdbMessageObject *self, PyObject *py_name)
>+{
>+	struct ldb_message_element *el = NULL;
>+	const char *name = NULL;
>+	struct ldb_message *msg = pyldb_Message_AsMessage(self);
>+	name = PyUnicode_AsUTF8(py_name);
>+	if (name == NULL) {
>+		return -1;
>+	}
>+	if (!ldb_attr_cmp(name, "dn")) {
>+		return 1;
>+	}
>+	el = ldb_msg_find_element(msg, name);
>+	return el != NULL ? 1 : 0;
>+}
>+
> static PyObject *py_ldb_msg_getitem(PyLdbMessageObject *self, PyObject *py_name)
> {
> 	struct ldb_message_element *el = NULL;
>@@ -3661,6 +3677,10 @@ static Py_ssize_t py_ldb_msg_length(PyLdbMessageObject *self)
> 	return pyldb_Message_AsMessage(self)->num_elements;
> }
> 
>+static PySequenceMethods py_ldb_msg_sequence = {
>+	.sq_contains = (objobjproc)py_ldb_msg_contains,
>+};
>+
> static PyMappingMethods py_ldb_msg_mapping = {
> 	.mp_length = (lenfunc)py_ldb_msg_length,
> 	.mp_subscript = (binaryfunc)py_ldb_msg_getitem,
>@@ -3838,6 +3858,7 @@ static PyTypeObject PyLdbMessage = {
> 	.tp_name = "ldb.Message",
> 	.tp_methods = py_ldb_msg_methods,
> 	.tp_getset = py_ldb_msg_getset,
>+	.tp_as_sequence = &py_ldb_msg_sequence,
> 	.tp_as_mapping = &py_ldb_msg_mapping,
> 	.tp_basicsize = sizeof(PyLdbMessageObject),
> 	.tp_dealloc = (destructor)py_ldb_msg_dealloc,
>diff --git a/selftest/knownfail.d/pyldb b/selftest/knownfail.d/pyldb
>deleted file mode 100644
>index 34bdac4f682..00000000000
>--- a/selftest/knownfail.d/pyldb
>+++ /dev/null
>@@ -1,4 +0,0 @@
>-^ldb.python.api.LdbMsgTests.test_contains_case
>-^ldb.python.api.LdbMsgTests.test_contains_dn
>-^ldb.python.api.LdbMsgTests.test_contains_dn_case
>-^ldb.python.api.LdbMsgTests.test_contains_invalid
>-- 
>2.25.1
>
>
>From 258c6f808005f188ced88b85ed5017e7def16d28 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Mon, 4 Oct 2021 21:57:25 +1300
>Subject: [PATCH 14/14] ldb: Release ldb 2.2.1
>
>* Corrected python behaviour for 'in' for LDAP attributes
>  contained as part of ldb.Message (bug 14845)
>* Fix memory handling in ldb.msg_diff (bug 14836)
>* Corrected python docstrings
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14845
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14836
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14848
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14881
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>
>Autobuild-User(v4-14-test): Stefan Metzmacher <metze@samba.org>
>Autobuild-Date(v4-14-test): Tue Oct 26 13:03:37 UTC 2021 on sn-devel-184
>---
> lib/ldb/ABI/ldb-2.2.2.sigs        | 283 ++++++++++++++++++++++++++++++
> lib/ldb/ABI/pyldb-util-2.2.2.sigs |   3 +
> lib/ldb/wscript                   |   2 +-
> 3 files changed, 287 insertions(+), 1 deletion(-)
> create mode 100644 lib/ldb/ABI/ldb-2.2.2.sigs
> create mode 100644 lib/ldb/ABI/pyldb-util-2.2.2.sigs
>
>diff --git a/lib/ldb/ABI/ldb-2.2.2.sigs b/lib/ldb/ABI/ldb-2.2.2.sigs
>new file mode 100644
>index 00000000000..5049dc64ce1
>--- /dev/null
>+++ b/lib/ldb/ABI/ldb-2.2.2.sigs
>@@ -0,0 +1,283 @@
>+ldb_add: int (struct ldb_context *, const struct ldb_message *)
>+ldb_any_comparison: int (struct ldb_context *, void *, ldb_attr_handler_t, const struct ldb_val *, const struct ldb_val *)
>+ldb_asprintf_errstring: void (struct ldb_context *, const char *, ...)
>+ldb_attr_casefold: char *(TALLOC_CTX *, const char *)
>+ldb_attr_dn: int (const char *)
>+ldb_attr_in_list: int (const char * const *, const char *)
>+ldb_attr_list_copy: const char **(TALLOC_CTX *, const char * const *)
>+ldb_attr_list_copy_add: const char **(TALLOC_CTX *, const char * const *, const char *)
>+ldb_base64_decode: int (char *)
>+ldb_base64_encode: char *(TALLOC_CTX *, const char *, int)
>+ldb_binary_decode: struct ldb_val (TALLOC_CTX *, const char *)
>+ldb_binary_encode: char *(TALLOC_CTX *, struct ldb_val)
>+ldb_binary_encode_string: char *(TALLOC_CTX *, const char *)
>+ldb_build_add_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
>+ldb_build_del_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
>+ldb_build_extended_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, const char *, void *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
>+ldb_build_mod_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
>+ldb_build_rename_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, struct ldb_dn *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
>+ldb_build_search_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, enum ldb_scope, const char *, const char * const *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
>+ldb_build_search_req_ex: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, enum ldb_scope, struct ldb_parse_tree *, const char * const *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
>+ldb_casefold: char *(struct ldb_context *, TALLOC_CTX *, const char *, size_t)
>+ldb_casefold_default: char *(void *, TALLOC_CTX *, const char *, size_t)
>+ldb_check_critical_controls: int (struct ldb_control **)
>+ldb_comparison_binary: int (struct ldb_context *, void *, const struct ldb_val *, const struct ldb_val *)
>+ldb_comparison_fold: int (struct ldb_context *, void *, const struct ldb_val *, const struct ldb_val *)
>+ldb_connect: int (struct ldb_context *, const char *, unsigned int, const char **)
>+ldb_control_to_string: char *(TALLOC_CTX *, const struct ldb_control *)
>+ldb_controls_except_specified: struct ldb_control **(struct ldb_control **, TALLOC_CTX *, struct ldb_control *)
>+ldb_debug: void (struct ldb_context *, enum ldb_debug_level, const char *, ...)
>+ldb_debug_add: void (struct ldb_context *, const char *, ...)
>+ldb_debug_end: void (struct ldb_context *, enum ldb_debug_level)
>+ldb_debug_set: void (struct ldb_context *, enum ldb_debug_level, const char *, ...)
>+ldb_delete: int (struct ldb_context *, struct ldb_dn *)
>+ldb_dn_add_base: bool (struct ldb_dn *, struct ldb_dn *)
>+ldb_dn_add_base_fmt: bool (struct ldb_dn *, const char *, ...)
>+ldb_dn_add_child: bool (struct ldb_dn *, struct ldb_dn *)
>+ldb_dn_add_child_fmt: bool (struct ldb_dn *, const char *, ...)
>+ldb_dn_add_child_val: bool (struct ldb_dn *, const char *, struct ldb_val)
>+ldb_dn_alloc_casefold: char *(TALLOC_CTX *, struct ldb_dn *)
>+ldb_dn_alloc_linearized: char *(TALLOC_CTX *, struct ldb_dn *)
>+ldb_dn_canonical_ex_string: char *(TALLOC_CTX *, struct ldb_dn *)
>+ldb_dn_canonical_string: char *(TALLOC_CTX *, struct ldb_dn *)
>+ldb_dn_check_local: bool (struct ldb_module *, struct ldb_dn *)
>+ldb_dn_check_special: bool (struct ldb_dn *, const char *)
>+ldb_dn_compare: int (struct ldb_dn *, struct ldb_dn *)
>+ldb_dn_compare_base: int (struct ldb_dn *, struct ldb_dn *)
>+ldb_dn_copy: struct ldb_dn *(TALLOC_CTX *, struct ldb_dn *)
>+ldb_dn_escape_value: char *(TALLOC_CTX *, struct ldb_val)
>+ldb_dn_extended_add_syntax: int (struct ldb_context *, unsigned int, const struct ldb_dn_extended_syntax *)
>+ldb_dn_extended_filter: void (struct ldb_dn *, const char * const *)
>+ldb_dn_extended_syntax_by_name: const struct ldb_dn_extended_syntax *(struct ldb_context *, const char *)
>+ldb_dn_from_ldb_val: struct ldb_dn *(TALLOC_CTX *, struct ldb_context *, const struct ldb_val *)
>+ldb_dn_get_casefold: const char *(struct ldb_dn *)
>+ldb_dn_get_comp_num: int (struct ldb_dn *)
>+ldb_dn_get_component_name: const char *(struct ldb_dn *, unsigned int)
>+ldb_dn_get_component_val: const struct ldb_val *(struct ldb_dn *, unsigned int)
>+ldb_dn_get_extended_comp_num: int (struct ldb_dn *)
>+ldb_dn_get_extended_component: const struct ldb_val *(struct ldb_dn *, const char *)
>+ldb_dn_get_extended_linearized: char *(TALLOC_CTX *, struct ldb_dn *, int)
>+ldb_dn_get_ldb_context: struct ldb_context *(struct ldb_dn *)
>+ldb_dn_get_linearized: const char *(struct ldb_dn *)
>+ldb_dn_get_parent: struct ldb_dn *(TALLOC_CTX *, struct ldb_dn *)
>+ldb_dn_get_rdn_name: const char *(struct ldb_dn *)
>+ldb_dn_get_rdn_val: const struct ldb_val *(struct ldb_dn *)
>+ldb_dn_has_extended: bool (struct ldb_dn *)
>+ldb_dn_is_null: bool (struct ldb_dn *)
>+ldb_dn_is_special: bool (struct ldb_dn *)
>+ldb_dn_is_valid: bool (struct ldb_dn *)
>+ldb_dn_map_local: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
>+ldb_dn_map_rebase_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
>+ldb_dn_map_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
>+ldb_dn_minimise: bool (struct ldb_dn *)
>+ldb_dn_new: struct ldb_dn *(TALLOC_CTX *, struct ldb_context *, const char *)
>+ldb_dn_new_fmt: struct ldb_dn *(TALLOC_CTX *, struct ldb_context *, const char *, ...)
>+ldb_dn_remove_base_components: bool (struct ldb_dn *, unsigned int)
>+ldb_dn_remove_child_components: bool (struct ldb_dn *, unsigned int)
>+ldb_dn_remove_extended_components: void (struct ldb_dn *)
>+ldb_dn_replace_components: bool (struct ldb_dn *, struct ldb_dn *)
>+ldb_dn_set_component: int (struct ldb_dn *, int, const char *, const struct ldb_val)
>+ldb_dn_set_extended_component: int (struct ldb_dn *, const char *, const struct ldb_val *)
>+ldb_dn_update_components: int (struct ldb_dn *, const struct ldb_dn *)
>+ldb_dn_validate: bool (struct ldb_dn *)
>+ldb_dump_results: void (struct ldb_context *, struct ldb_result *, FILE *)
>+ldb_error_at: int (struct ldb_context *, int, const char *, const char *, int)
>+ldb_errstring: const char *(struct ldb_context *)
>+ldb_extended: int (struct ldb_context *, const char *, void *, struct ldb_result **)
>+ldb_extended_default_callback: int (struct ldb_request *, struct ldb_reply *)
>+ldb_filter_attrs: int (struct ldb_context *, const struct ldb_message *, const char * const *, struct ldb_message *)
>+ldb_filter_from_tree: char *(TALLOC_CTX *, const struct ldb_parse_tree *)
>+ldb_get_config_basedn: struct ldb_dn *(struct ldb_context *)
>+ldb_get_create_perms: unsigned int (struct ldb_context *)
>+ldb_get_default_basedn: struct ldb_dn *(struct ldb_context *)
>+ldb_get_event_context: struct tevent_context *(struct ldb_context *)
>+ldb_get_flags: unsigned int (struct ldb_context *)
>+ldb_get_opaque: void *(struct ldb_context *, const char *)
>+ldb_get_root_basedn: struct ldb_dn *(struct ldb_context *)
>+ldb_get_schema_basedn: struct ldb_dn *(struct ldb_context *)
>+ldb_global_init: int (void)
>+ldb_handle_get_event_context: struct tevent_context *(struct ldb_handle *)
>+ldb_handle_new: struct ldb_handle *(TALLOC_CTX *, struct ldb_context *)
>+ldb_handle_use_global_event_context: void (struct ldb_handle *)
>+ldb_handler_copy: int (struct ldb_context *, void *, const struct ldb_val *, struct ldb_val *)
>+ldb_handler_fold: int (struct ldb_context *, void *, const struct ldb_val *, struct ldb_val *)
>+ldb_init: struct ldb_context *(TALLOC_CTX *, struct tevent_context *)
>+ldb_ldif_message_redacted_string: char *(struct ldb_context *, TALLOC_CTX *, enum ldb_changetype, const struct ldb_message *)
>+ldb_ldif_message_string: char *(struct ldb_context *, TALLOC_CTX *, enum ldb_changetype, const struct ldb_message *)
>+ldb_ldif_parse_modrdn: int (struct ldb_context *, const struct ldb_ldif *, TALLOC_CTX *, struct ldb_dn **, struct ldb_dn **, bool *, struct ldb_dn **, struct ldb_dn **)
>+ldb_ldif_read: struct ldb_ldif *(struct ldb_context *, int (*)(void *), void *)
>+ldb_ldif_read_file: struct ldb_ldif *(struct ldb_context *, FILE *)
>+ldb_ldif_read_file_state: struct ldb_ldif *(struct ldb_context *, struct ldif_read_file_state *)
>+ldb_ldif_read_free: void (struct ldb_context *, struct ldb_ldif *)
>+ldb_ldif_read_string: struct ldb_ldif *(struct ldb_context *, const char **)
>+ldb_ldif_write: int (struct ldb_context *, int (*)(void *, const char *, ...), void *, const struct ldb_ldif *)
>+ldb_ldif_write_file: int (struct ldb_context *, FILE *, const struct ldb_ldif *)
>+ldb_ldif_write_redacted_trace_string: char *(struct ldb_context *, TALLOC_CTX *, const struct ldb_ldif *)
>+ldb_ldif_write_string: char *(struct ldb_context *, TALLOC_CTX *, const struct ldb_ldif *)
>+ldb_load_modules: int (struct ldb_context *, const char **)
>+ldb_map_add: int (struct ldb_module *, struct ldb_request *)
>+ldb_map_delete: int (struct ldb_module *, struct ldb_request *)
>+ldb_map_init: int (struct ldb_module *, const struct ldb_map_attribute *, const struct ldb_map_objectclass *, const char * const *, const char *, const char *)
>+ldb_map_modify: int (struct ldb_module *, struct ldb_request *)
>+ldb_map_rename: int (struct ldb_module *, struct ldb_request *)
>+ldb_map_search: int (struct ldb_module *, struct ldb_request *)
>+ldb_match_message: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, enum ldb_scope, bool *)
>+ldb_match_msg: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, struct ldb_dn *, enum ldb_scope)
>+ldb_match_msg_error: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, struct ldb_dn *, enum ldb_scope, bool *)
>+ldb_match_msg_objectclass: int (const struct ldb_message *, const char *)
>+ldb_mod_register_control: int (struct ldb_module *, const char *)
>+ldb_modify: int (struct ldb_context *, const struct ldb_message *)
>+ldb_modify_default_callback: int (struct ldb_request *, struct ldb_reply *)
>+ldb_module_call_chain: char *(struct ldb_request *, TALLOC_CTX *)
>+ldb_module_connect_backend: int (struct ldb_context *, const char *, const char **, struct ldb_module **)
>+ldb_module_done: int (struct ldb_request *, struct ldb_control **, struct ldb_extended *, int)
>+ldb_module_flags: uint32_t (struct ldb_context *)
>+ldb_module_get_ctx: struct ldb_context *(struct ldb_module *)
>+ldb_module_get_name: const char *(struct ldb_module *)
>+ldb_module_get_ops: const struct ldb_module_ops *(struct ldb_module *)
>+ldb_module_get_private: void *(struct ldb_module *)
>+ldb_module_init_chain: int (struct ldb_context *, struct ldb_module *)
>+ldb_module_load_list: int (struct ldb_context *, const char **, struct ldb_module *, struct ldb_module **)
>+ldb_module_new: struct ldb_module *(TALLOC_CTX *, struct ldb_context *, const char *, const struct ldb_module_ops *)
>+ldb_module_next: struct ldb_module *(struct ldb_module *)
>+ldb_module_popt_options: struct poptOption **(struct ldb_context *)
>+ldb_module_send_entry: int (struct ldb_request *, struct ldb_message *, struct ldb_control **)
>+ldb_module_send_referral: int (struct ldb_request *, char *)
>+ldb_module_set_next: void (struct ldb_module *, struct ldb_module *)
>+ldb_module_set_private: void (struct ldb_module *, void *)
>+ldb_modules_hook: int (struct ldb_context *, enum ldb_module_hook_type)
>+ldb_modules_list_from_string: const char **(struct ldb_context *, TALLOC_CTX *, const char *)
>+ldb_modules_load: int (const char *, const char *)
>+ldb_msg_add: int (struct ldb_message *, const struct ldb_message_element *, int)
>+ldb_msg_add_empty: int (struct ldb_message *, const char *, int, struct ldb_message_element **)
>+ldb_msg_add_fmt: int (struct ldb_message *, const char *, const char *, ...)
>+ldb_msg_add_linearized_dn: int (struct ldb_message *, const char *, struct ldb_dn *)
>+ldb_msg_add_steal_string: int (struct ldb_message *, const char *, char *)
>+ldb_msg_add_steal_value: int (struct ldb_message *, const char *, struct ldb_val *)
>+ldb_msg_add_string: int (struct ldb_message *, const char *, const char *)
>+ldb_msg_add_value: int (struct ldb_message *, const char *, const struct ldb_val *, struct ldb_message_element **)
>+ldb_msg_canonicalize: struct ldb_message *(struct ldb_context *, const struct ldb_message *)
>+ldb_msg_check_string_attribute: int (const struct ldb_message *, const char *, const char *)
>+ldb_msg_copy: struct ldb_message *(TALLOC_CTX *, const struct ldb_message *)
>+ldb_msg_copy_attr: int (struct ldb_message *, const char *, const char *)
>+ldb_msg_copy_shallow: struct ldb_message *(TALLOC_CTX *, const struct ldb_message *)
>+ldb_msg_diff: struct ldb_message *(struct ldb_context *, struct ldb_message *, struct ldb_message *)
>+ldb_msg_difference: int (struct ldb_context *, TALLOC_CTX *, struct ldb_message *, struct ldb_message *, struct ldb_message **)
>+ldb_msg_element_compare: int (struct ldb_message_element *, struct ldb_message_element *)
>+ldb_msg_element_compare_name: int (struct ldb_message_element *, struct ldb_message_element *)
>+ldb_msg_element_equal_ordered: bool (const struct ldb_message_element *, const struct ldb_message_element *)
>+ldb_msg_find_attr_as_bool: int (const struct ldb_message *, const char *, int)
>+ldb_msg_find_attr_as_dn: struct ldb_dn *(struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, const char *)
>+ldb_msg_find_attr_as_double: double (const struct ldb_message *, const char *, double)
>+ldb_msg_find_attr_as_int: int (const struct ldb_message *, const char *, int)
>+ldb_msg_find_attr_as_int64: int64_t (const struct ldb_message *, const char *, int64_t)
>+ldb_msg_find_attr_as_string: const char *(const struct ldb_message *, const char *, const char *)
>+ldb_msg_find_attr_as_uint: unsigned int (const struct ldb_message *, const char *, unsigned int)
>+ldb_msg_find_attr_as_uint64: uint64_t (const struct ldb_message *, const char *, uint64_t)
>+ldb_msg_find_common_values: int (struct ldb_context *, TALLOC_CTX *, struct ldb_message_element *, struct ldb_message_element *, uint32_t)
>+ldb_msg_find_duplicate_val: int (struct ldb_context *, TALLOC_CTX *, const struct ldb_message_element *, struct ldb_val **, uint32_t)
>+ldb_msg_find_element: struct ldb_message_element *(const struct ldb_message *, const char *)
>+ldb_msg_find_ldb_val: const struct ldb_val *(const struct ldb_message *, const char *)
>+ldb_msg_find_val: struct ldb_val *(const struct ldb_message_element *, struct ldb_val *)
>+ldb_msg_new: struct ldb_message *(TALLOC_CTX *)
>+ldb_msg_normalize: int (struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_message **)
>+ldb_msg_remove_attr: void (struct ldb_message *, const char *)
>+ldb_msg_remove_element: void (struct ldb_message *, struct ldb_message_element *)
>+ldb_msg_rename_attr: int (struct ldb_message *, const char *, const char *)
>+ldb_msg_sanity_check: int (struct ldb_context *, const struct ldb_message *)
>+ldb_msg_sort_elements: void (struct ldb_message *)
>+ldb_next_del_trans: int (struct ldb_module *)
>+ldb_next_end_trans: int (struct ldb_module *)
>+ldb_next_init: int (struct ldb_module *)
>+ldb_next_prepare_commit: int (struct ldb_module *)
>+ldb_next_read_lock: int (struct ldb_module *)
>+ldb_next_read_unlock: int (struct ldb_module *)
>+ldb_next_remote_request: int (struct ldb_module *, struct ldb_request *)
>+ldb_next_request: int (struct ldb_module *, struct ldb_request *)
>+ldb_next_start_trans: int (struct ldb_module *)
>+ldb_op_default_callback: int (struct ldb_request *, struct ldb_reply *)
>+ldb_options_copy: const char **(TALLOC_CTX *, const char **)
>+ldb_options_find: const char *(struct ldb_context *, const char **, const char *)
>+ldb_options_get: const char **(struct ldb_context *)
>+ldb_pack_data: int (struct ldb_context *, const struct ldb_message *, struct ldb_val *, uint32_t)
>+ldb_parse_control_from_string: struct ldb_control *(struct ldb_context *, TALLOC_CTX *, const char *)
>+ldb_parse_control_strings: struct ldb_control **(struct ldb_context *, TALLOC_CTX *, const char **)
>+ldb_parse_tree: struct ldb_parse_tree *(TALLOC_CTX *, const char *)
>+ldb_parse_tree_attr_replace: void (struct ldb_parse_tree *, const char *, const char *)
>+ldb_parse_tree_copy_shallow: struct ldb_parse_tree *(TALLOC_CTX *, const struct ldb_parse_tree *)
>+ldb_parse_tree_walk: int (struct ldb_parse_tree *, int (*)(struct ldb_parse_tree *, void *), void *)
>+ldb_qsort: void (void * const, size_t, size_t, void *, ldb_qsort_cmp_fn_t)
>+ldb_register_backend: int (const char *, ldb_connect_fn, bool)
>+ldb_register_extended_match_rule: int (struct ldb_context *, const struct ldb_extended_match_rule *)
>+ldb_register_hook: int (ldb_hook_fn)
>+ldb_register_module: int (const struct ldb_module_ops *)
>+ldb_rename: int (struct ldb_context *, struct ldb_dn *, struct ldb_dn *)
>+ldb_reply_add_control: int (struct ldb_reply *, const char *, bool, void *)
>+ldb_reply_get_control: struct ldb_control *(struct ldb_reply *, const char *)
>+ldb_req_get_custom_flags: uint32_t (struct ldb_request *)
>+ldb_req_is_untrusted: bool (struct ldb_request *)
>+ldb_req_location: const char *(struct ldb_request *)
>+ldb_req_mark_trusted: void (struct ldb_request *)
>+ldb_req_mark_untrusted: void (struct ldb_request *)
>+ldb_req_set_custom_flags: void (struct ldb_request *, uint32_t)
>+ldb_req_set_location: void (struct ldb_request *, const char *)
>+ldb_request: int (struct ldb_context *, struct ldb_request *)
>+ldb_request_add_control: int (struct ldb_request *, const char *, bool, void *)
>+ldb_request_done: int (struct ldb_request *, int)
>+ldb_request_get_control: struct ldb_control *(struct ldb_request *, const char *)
>+ldb_request_get_status: int (struct ldb_request *)
>+ldb_request_replace_control: int (struct ldb_request *, const char *, bool, void *)
>+ldb_request_set_state: void (struct ldb_request *, int)
>+ldb_reset_err_string: void (struct ldb_context *)
>+ldb_save_controls: int (struct ldb_control *, struct ldb_request *, struct ldb_control ***)
>+ldb_schema_attribute_add: int (struct ldb_context *, const char *, unsigned int, const char *)
>+ldb_schema_attribute_add_with_syntax: int (struct ldb_context *, const char *, unsigned int, const struct ldb_schema_syntax *)
>+ldb_schema_attribute_by_name: const struct ldb_schema_attribute *(struct ldb_context *, const char *)
>+ldb_schema_attribute_fill_with_syntax: int (struct ldb_context *, TALLOC_CTX *, const char *, unsigned int, const struct ldb_schema_syntax *, struct ldb_schema_attribute *)
>+ldb_schema_attribute_remove: void (struct ldb_context *, const char *)
>+ldb_schema_attribute_remove_flagged: void (struct ldb_context *, unsigned int)
>+ldb_schema_attribute_set_override_handler: void (struct ldb_context *, ldb_attribute_handler_override_fn_t, void *)
>+ldb_schema_set_override_GUID_index: void (struct ldb_context *, const char *, const char *)
>+ldb_schema_set_override_indexlist: void (struct ldb_context *, bool)
>+ldb_search: int (struct ldb_context *, TALLOC_CTX *, struct ldb_result **, struct ldb_dn *, enum ldb_scope, const char * const *, const char *, ...)
>+ldb_search_default_callback: int (struct ldb_request *, struct ldb_reply *)
>+ldb_sequence_number: int (struct ldb_context *, enum ldb_sequence_type, uint64_t *)
>+ldb_set_create_perms: void (struct ldb_context *, unsigned int)
>+ldb_set_debug: int (struct ldb_context *, void (*)(void *, enum ldb_debug_level, const char *, va_list), void *)
>+ldb_set_debug_stderr: int (struct ldb_context *)
>+ldb_set_default_dns: void (struct ldb_context *)
>+ldb_set_errstring: void (struct ldb_context *, const char *)
>+ldb_set_event_context: void (struct ldb_context *, struct tevent_context *)
>+ldb_set_flags: void (struct ldb_context *, unsigned int)
>+ldb_set_modules_dir: void (struct ldb_context *, const char *)
>+ldb_set_opaque: int (struct ldb_context *, const char *, void *)
>+ldb_set_require_private_event_context: void (struct ldb_context *)
>+ldb_set_timeout: int (struct ldb_context *, struct ldb_request *, int)
>+ldb_set_timeout_from_prev_req: int (struct ldb_context *, struct ldb_request *, struct ldb_request *)
>+ldb_set_utf8_default: void (struct ldb_context *)
>+ldb_set_utf8_fns: void (struct ldb_context *, void *, char *(*)(void *, void *, const char *, size_t))
>+ldb_setup_wellknown_attributes: int (struct ldb_context *)
>+ldb_should_b64_encode: int (struct ldb_context *, const struct ldb_val *)
>+ldb_standard_syntax_by_name: const struct ldb_schema_syntax *(struct ldb_context *, const char *)
>+ldb_strerror: const char *(int)
>+ldb_string_to_time: time_t (const char *)
>+ldb_string_utc_to_time: time_t (const char *)
>+ldb_timestring: char *(TALLOC_CTX *, time_t)
>+ldb_timestring_utc: char *(TALLOC_CTX *, time_t)
>+ldb_transaction_cancel: int (struct ldb_context *)
>+ldb_transaction_cancel_noerr: int (struct ldb_context *)
>+ldb_transaction_commit: int (struct ldb_context *)
>+ldb_transaction_prepare_commit: int (struct ldb_context *)
>+ldb_transaction_start: int (struct ldb_context *)
>+ldb_unpack_data: int (struct ldb_context *, const struct ldb_val *, struct ldb_message *)
>+ldb_unpack_data_flags: int (struct ldb_context *, const struct ldb_val *, struct ldb_message *, unsigned int)
>+ldb_unpack_get_format: int (const struct ldb_val *, uint32_t *)
>+ldb_val_dup: struct ldb_val (TALLOC_CTX *, const struct ldb_val *)
>+ldb_val_equal_exact: int (const struct ldb_val *, const struct ldb_val *)
>+ldb_val_map_local: struct ldb_val (struct ldb_module *, void *, const struct ldb_map_attribute *, const struct ldb_val *)
>+ldb_val_map_remote: struct ldb_val (struct ldb_module *, void *, const struct ldb_map_attribute *, const struct ldb_val *)
>+ldb_val_string_cmp: int (const struct ldb_val *, const char *)
>+ldb_val_to_time: int (const struct ldb_val *, time_t *)
>+ldb_valid_attr_name: int (const char *)
>+ldb_vdebug: void (struct ldb_context *, enum ldb_debug_level, const char *, va_list)
>+ldb_wait: int (struct ldb_handle *, enum ldb_wait_type)
>diff --git a/lib/ldb/ABI/pyldb-util-2.2.2.sigs b/lib/ldb/ABI/pyldb-util-2.2.2.sigs
>new file mode 100644
>index 00000000000..164a806b2ff
>--- /dev/null
>+++ b/lib/ldb/ABI/pyldb-util-2.2.2.sigs
>@@ -0,0 +1,3 @@
>+pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
>+pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
>+pyldb_check_type: bool (PyObject *, const char *)
>diff --git a/lib/ldb/wscript b/lib/ldb/wscript
>index 164065ab79a..b2bb923379f 100644
>--- a/lib/ldb/wscript
>+++ b/lib/ldb/wscript
>@@ -1,7 +1,7 @@
> #!/usr/bin/env python
> 
> APPNAME = 'ldb'
>-VERSION = '2.2.1'
>+VERSION = '2.2.2'
> 
> import sys, os
> 
>-- 
>2.25.1
>

Flags:

metze: review+
abartlet: ci-passed+

Actions: View

Attachments on bug 14848: 16837 | 16848 | 16866 | 16867 | 16880