Attachment 14855 Details for Bug 13773 – Proposed patch for version V4.10 V1

[patch] Proposed patch for version V4.10 V1

CVE-2019-3824-v4-10-01.patch (text/plain), 41.49 KB, created by Gary Lockyer on 2019-02-20 03:43:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gary Lockyer

Created: 2019-02-20 03:43:34 UTC

Size: 41.49 KB

patch

obsolete

>From efe137d05231f04355a82f9ad2b40d08489a82f1 Mon Sep 17 00:00:00 2001
>From: Lukas Slebodnik <lslebodn@fedoraproject.org>
>Date: Fri, 18 Jan 2019 16:37:24 +0100
>Subject: [PATCH 1/8] CVE-2019-3824 ldb: Out of bound read in
> ldb_wildcard_compare
>
>There is valgrind error in few tests tests/test-generic.sh
> 91 echo "Test wildcard match"
> 92 $VALGRIND ldbadd $LDBDIR/tests/test-wildcard.ldif  || exit 1
> 93 $VALGRIND ldbsearch '(cn=test*multi)'  || exit 1
> 95 $VALGRIND ldbsearch '(cn=*test_multi)'  || exit 1
> 97 $VALGRIND ldbsearch '(cn=test*multi*test*multi)'  || exit 1
>
>e.g.
>  ==3098== Memcheck, a memory error detector
>  ==3098== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
>  ==3098== Using Valgrind-3.14.0 and LibVEX; rerun with -h for copyright info
>  ==3098== Command: ./bin/ldbsearch (cn=test*multi)
>  ==3098==
>  ==3098== Invalid read of size 1
>  ==3098==    at 0x483CEE7: memchr (vg_replace_strmem.c:890)
>  ==3098==    by 0x49A9073: memmem (in /usr/lib64/libc-2.28.9000.so)
>  ==3098==    by 0x485DFE9: ldb_wildcard_compare (ldb_match.c:313)
>  ==3098==    by 0x485DFE9: ldb_match_substring (ldb_match.c:360)
>  ==3098==    by 0x485DFE9: ldb_match_message (ldb_match.c:572)
>  ==3098==    by 0x558F8FA: search_func (ldb_kv_search.c:549)
>  ==3098==    by 0x48C78CA: ??? (in /usr/lib64/libtdb.so.1.3.17)
>  ==3098==    by 0x48C7A60: tdb_traverse_read (in /usr/lib64/libtdb.so.1.3.17)
>  ==3098==    by 0x557B7C4: ltdb_traverse_fn (ldb_tdb.c:274)
>  ==3098==    by 0x558FBFA: ldb_kv_search_full (ldb_kv_search.c:594)
>  ==3098==    by 0x558FBFA: ldb_kv_search (ldb_kv_search.c:854)
>  ==3098==    by 0x558E497: ldb_kv_callback (ldb_kv.c:1713)
>  ==3098==    by 0x48FCD58: tevent_common_invoke_timer_handler (in /usr/lib64/libtevent.so.0.9.38)
>  ==3098==    by 0x48FCEFD: tevent_common_loop_timer_delay (in /usr/lib64/libtevent.so.0.9.38)
>  ==3098==    by 0x48FE14A: ??? (in /usr/lib64/libtevent.so.0.9.38)
>  ==3098==  Address 0x4b4ab81 is 0 bytes after a block of size 129 alloc'd
>  ==3098==    at 0x483880B: malloc (vg_replace_malloc.c:309)
>  ==3098==    by 0x491048B: talloc_strndup (in /usr/lib64/libtalloc.so.2.1.15)
>  ==3098==    by 0x48593CA: ldb_casefold_default (ldb_utf8.c:59)
>  ==3098==    by 0x485F68D: ldb_handler_fold (attrib_handlers.c:64)
>  ==3098==    by 0x485DB88: ldb_wildcard_compare (ldb_match.c:257)
>  ==3098==    by 0x485DB88: ldb_match_substring (ldb_match.c:360)
>  ==3098==    by 0x485DB88: ldb_match_message (ldb_match.c:572)
>  ==3098==    by 0x558F8FA: search_func (ldb_kv_search.c:549)
>  ==3098==    by 0x48C78CA: ??? (in /usr/lib64/libtdb.so.1.3.17)
>  ==3098==    by 0x48C7A60: tdb_traverse_read (in /usr/lib64/libtdb.so.1.3.17)
>  ==3098==    by 0x557B7C4: ltdb_traverse_fn (ldb_tdb.c:274)
>  ==3098==    by 0x558FBFA: ldb_kv_search_full (ldb_kv_search.c:594)
>  ==3098==    by 0x558FBFA: ldb_kv_search (ldb_kv_search.c:854)
>  ==3098==    by 0x558E497: ldb_kv_callback (ldb_kv.c:1713)
>  ==3098==    by 0x48FCD58: tevent_common_invoke_timer_handler (in /usr/lib64/libtevent.so.0.9.38)
>  ==3098==
>  # record 1
>  dn: cn=test_multi_test_multi_test_multi,o=University of Michigan,c=TEST
>  cn: test_multi_test_multi_test_multi
>  description: test multi wildcards matching
>  objectclass: person
>  sn: multi_test
>  name: test_multi_test_multi_test_multi
>  distinguishedName: cn=test_multi_test_multi_test_multi,o=University of Michiga
>   n,c=TEST
>
>  # returned 1 records
>  # 1 entries
>  # 0 referrals
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13773
>
>Signed-off-by: Lukas Slebodnik <lslebodn@fedoraproject.org>
>---
> lib/ldb/common/ldb_match.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
>index 25fe3f9c21b..8eeedfb12e0 100644
>--- a/lib/ldb/common/ldb_match.c
>+++ b/lib/ldb/common/ldb_match.c
>@@ -308,9 +308,10 @@ static int ldb_wildcard_compare(struct ldb_context *ldb,
> 		if (p == NULL) goto mismatch;
> 		if ( (! tree->u.substring.chunks[c + 1]) && (! tree->u.substring.end_with_wildcard) ) {
> 			uint8_t *g;
>+			uint8_t *end = val.data + val.length;
> 			do { /* greedy */
> 				g = memmem(p + cnk.length,
>-					val.length - (p - val.data),
>+					end - (p + cnk.length),
> 					(const uint8_t *)cnk.data,
> 					cnk.length);
> 				if (g) p = g;
>-- 
>2.17.1
>
>
>From ec479147365bfc7c7462b6ea99f72178c683a93d Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Mon, 4 Feb 2019 11:22:34 +1300
>Subject: [PATCH 2/8] CVE-2019-3824 ldb: Extra comments to clarify no pointer
> wrap in wildcard processing
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13773
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>---
> lib/ldb/common/ldb_match.c | 25 +++++++++++++++++++++++--
> 1 file changed, 23 insertions(+), 2 deletions(-)
>
>diff --git a/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
>index 8eeedfb12e0..1920b661f75 100644
>--- a/lib/ldb/common/ldb_match.c
>+++ b/lib/ldb/common/ldb_match.c
>@@ -306,12 +306,33 @@ static int ldb_wildcard_compare(struct ldb_context *ldb,
> 		p = memmem((const void *)val.data,val.length,
> 			   (const void *)cnk.data, cnk.length);
> 		if (p == NULL) goto mismatch;
>+
>+		/*
>+		 * At this point we know cnk.length <= val.length as
>+		 * otherwise there could be no match
>+		 */
>+
> 		if ( (! tree->u.substring.chunks[c + 1]) && (! tree->u.substring.end_with_wildcard) ) {
> 			uint8_t *g;
> 			uint8_t *end = val.data + val.length;
> 			do { /* greedy */
>-				g = memmem(p + cnk.length,
>-					end - (p + cnk.length),
>+
>+				/*
>+				 * haystack is a valid pointer in val
>+				 * because the memmem() can only
>+				 * succeed if the needle (cnk.length)
>+				 * is <= haystacklen
>+				 *
>+				 * p will be a pointer at least
>+				 * cnk.length from the end of haystack
>+				 */
>+				uint8_t *haystack
>+					= p + cnk.length;
>+				size_t haystacklen
>+					= end - (haystack);
>+
>+				g = memmem(haystack,
>+					   haystacklen,
> 					(const uint8_t *)cnk.data,
> 					cnk.length);
> 				if (g) p = g;
>-- 
>2.17.1
>
>
>From 88a28281ad5c6b0908a127a909197f25f3341e31 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Mon, 4 Feb 2019 11:22:50 +1300
>Subject: [PATCH 3/8] CVE-2019-3824 ldb: Improve code style and layout in
> wildcard processing
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13773
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>---
> lib/ldb/common/ldb_match.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
>index 1920b661f75..ab0a89888f0 100644
>--- a/lib/ldb/common/ldb_match.c
>+++ b/lib/ldb/common/ldb_match.c
>@@ -333,9 +333,11 @@ static int ldb_wildcard_compare(struct ldb_context *ldb,
> 
> 				g = memmem(haystack,
> 					   haystacklen,
>-					(const uint8_t *)cnk.data,
>-					cnk.length);
>-				if (g) p = g;
>+					   (const uint8_t *)cnk.data,
>+					   cnk.length);
>+				if (g) {
>+					p = g;
>+				}
> 			} while(g);
> 		}
> 		val.length = val.length - (p - (uint8_t *)(val.data)) - cnk.length;
>-- 
>2.17.1
>
>
>From df5c0f74eb4af2fe803bb149c1498f58068abe78 Mon Sep 17 00:00:00 2001
>From: Gary Lockyer <gary@catalyst.net.nz>
>Date: Tue, 19 Feb 2019 10:25:24 +1300
>Subject: [PATCH 4/8] CVE-2019-3824 ldb: ldb_parse_tree use talloc_zero
>
>Initialise the created ldb_parse_tree with talloc_zero, this ensures
>that it is correctly initialised if inadvertently passed to a function
>expecting a different operation type.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13773
>
>Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
>---
> lib/ldb/common/ldb_parse.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
>index 5fa5a74afa9..db420091311 100644
>--- a/lib/ldb/common/ldb_parse.c
>+++ b/lib/ldb/common/ldb_parse.c
>@@ -389,7 +389,7 @@ static struct ldb_parse_tree *ldb_parse_simple(TALLOC_CTX *mem_ctx, const char *
> 	struct ldb_parse_tree *ret;
> 	enum ldb_parse_op filtertype;
> 
>-	ret = talloc(mem_ctx, struct ldb_parse_tree);
>+	ret = talloc_zero(mem_ctx, struct ldb_parse_tree);
> 	if (!ret) {
> 		errno = ENOMEM;
> 		return NULL;
>-- 
>2.17.1
>
>
>From bbc6357489827646a10b0c77d2ba76a3c837a908 Mon Sep 17 00:00:00 2001
>From: Gary Lockyer <gary@catalyst.net.nz>
>Date: Tue, 19 Feb 2019 10:26:25 +1300
>Subject: [PATCH 5/8] CVE-2019-3824 ldb: wildcard_match check tree operation
>
>Check the operation type of the passed parse tree, and return
>LDB_INAPPROPRIATE_MATCH if the operation is not LDB_OP_SUBSTRING.
>
>A query of "attribute=*" gets parsed as LDB_OP_PRESENT, checking the
>operation and failing ldb_wildcard_match should help prevent confusion
>writing tests.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13773
>
>Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
>---
> lib/ldb/common/ldb_match.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
>index ab0a89888f0..59f48b52b70 100644
>--- a/lib/ldb/common/ldb_match.c
>+++ b/lib/ldb/common/ldb_match.c
>@@ -244,6 +244,11 @@ static int ldb_wildcard_compare(struct ldb_context *ldb,
> 	uint8_t *save_p = NULL;
> 	unsigned int c = 0;
> 
>+	if (tree->operation != LDB_OP_SUBSTRING) {
>+		*matched = false;
>+		return LDB_ERR_INAPPROPRIATE_MATCHING;
>+	}
>+
> 	a = ldb_schema_attribute_by_name(ldb, tree->u.substring.attr);
> 	if (!a) {
> 		return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
>-- 
>2.17.1
>
>
>From 515e774e02ef30e4ef3cf8833b48ca2a6799cd47 Mon Sep 17 00:00:00 2001
>From: Gary Lockyer <gary@catalyst.net.nz>
>Date: Tue, 19 Feb 2019 10:26:56 +1300
>Subject: [PATCH 6/8] CVE-2019-3824 ldb: wildcard_match end of data check
>
>ldb_handler_copy and ldb_val_dup over allocate by one and add a trailing '\0'
>to the data, to make them safe to use the C string functions on.
>
>However testing for the trailing '\0' is not the correct way to test for
>the end of a value, the length should be checked instead.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13773
>
>Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
>---
> lib/ldb/common/ldb_match.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
>index 59f48b52b70..829afa77e71 100644
>--- a/lib/ldb/common/ldb_match.c
>+++ b/lib/ldb/common/ldb_match.c
>@@ -353,7 +353,7 @@ static int ldb_wildcard_compare(struct ldb_context *ldb,
> 	}
> 
> 	/* last chunk may not have reached end of string */
>-	if ( (! tree->u.substring.end_with_wildcard) && (*(val.data) != 0) ) goto mismatch;
>+	if ( (! tree->u.substring.end_with_wildcard) && (val.length != 0) ) goto mismatch;
> 	talloc_free(save_p);
> 	*matched = true;
> 	return LDB_SUCCESS;
>-- 
>2.17.1
>
>
>From 7cc9d01f2ceb2395039beaf9e35fe7da3013559d Mon Sep 17 00:00:00 2001
>From: Gary Lockyer <gary@catalyst.net.nz>
>Date: Tue, 19 Feb 2019 10:24:38 +1300
>Subject: [PATCH 7/8] CVE-2019-3824 ldb: Add tests for ldb_wildcard_match
>
>Add cmocka tests for ldb_wildcard_match.
>
>Running test_wildcard_match under valgrind reproduces
> CVE-2019-3824 out of bounds read in wildcard compare (bug 13773)
>
> valgrind --suppressions=lib/ldb/tests/ldb_match_test.valgrind\
>          bin/ldb_match_test
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13773
>
>Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
>---
> lib/ldb/tests/ldb_match_test.c        | 191 ++++++++++++++++++++++++++
> lib/ldb/tests/ldb_match_test.valgrind |  16 +++
> lib/ldb/wscript                       |   8 +-
> 3 files changed, 214 insertions(+), 1 deletion(-)
> create mode 100644 lib/ldb/tests/ldb_match_test.c
> create mode 100644 lib/ldb/tests/ldb_match_test.valgrind
>
>diff --git a/lib/ldb/tests/ldb_match_test.c b/lib/ldb/tests/ldb_match_test.c
>new file mode 100644
>index 00000000000..e09f50c86ba
>--- /dev/null
>+++ b/lib/ldb/tests/ldb_match_test.c
>@@ -0,0 +1,191 @@
>+/*
>+ * Tests exercising the ldb match operations.
>+ *
>+ *
>+ * Copyright (C) Catalyst.NET Ltd 2017
>+ *
>+ * This program is free software; you can redistribute it and/or modify
>+ * it under the terms of the GNU General Public License as published by
>+ * the Free Software Foundation; either version 3 of the License, or
>+ * (at your option) any later version.
>+ *
>+ * This program is distributed in the hope that it will be useful,
>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+ * GNU General Public License for more details.
>+ *
>+ * You should have received a copy of the GNU General Public License
>+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
>+ *
>+ */
>+
>+/*
>+ * from cmocka.c:
>+ * These headers or their equivalents should be included prior to
>+ * including
>+ * this header file.
>+ *
>+ * #include <stdarg.h>
>+ * #include <stddef.h>
>+ * #include <setjmp.h>
>+ *
>+ * This allows test applications to use custom definitions of C standard
>+ * library functions and types.
>+ */
>+#include <stdarg.h>
>+#include <stddef.h>
>+#include <stdint.h>
>+#include <setjmp.h>
>+#include <cmocka.h>
>+
>+#include "../common/ldb_match.c"
>+
>+#include "../include/ldb.h"
>+
>+struct ldbtest_ctx {
>+	struct tevent_context *ev;
>+	struct ldb_context *ldb;
>+};
>+
>+static int ldb_test_canonicalise(
>+	struct ldb_context *ldb,
>+	void *mem_ctx,
>+	const struct ldb_val *in,
>+	struct ldb_val *out)
>+{
>+	out->length = in->length;
>+	out->data = in->data;
>+	return 0;
>+}
>+
>+static int setup(void **state)
>+{
>+	struct ldbtest_ctx *test_ctx;
>+	struct ldb_schema_syntax *syntax = NULL;
>+	int ret;
>+
>+	test_ctx = talloc_zero(NULL, struct ldbtest_ctx);
>+	assert_non_null(test_ctx);
>+
>+	test_ctx->ev = tevent_context_init(test_ctx);
>+	assert_non_null(test_ctx->ev);
>+
>+	test_ctx->ldb = ldb_init(test_ctx, test_ctx->ev);
>+	assert_non_null(test_ctx->ldb);
>+
>+	syntax = talloc_zero(test_ctx, struct ldb_schema_syntax);
>+	assert_non_null(syntax);
>+	syntax->canonicalise_fn = ldb_test_canonicalise;
>+
>+	ret = ldb_schema_attribute_add_with_syntax(
>+	    test_ctx->ldb, "a", LDB_ATTR_FLAG_FIXED, syntax);
>+	assert_int_equal(LDB_SUCCESS, ret);
>+
>+	*state = test_ctx;
>+	return 0;
>+}
>+
>+static int teardown(void **state)
>+{
>+	talloc_free(*state);
>+	return 0;
>+}
>+
>+
>+/*
>+ * The wild card pattern "attribute=*" is parsed as an LDB_OP_PRESENT operation
>+ * rather than a LDB_OP_????
>+ *
>+ * This test serves to document that behaviour, and to confirm that
>+ * ldb_wildcard_compare handles this case appropriately.
>+ */
>+static void test_wildcard_match_star(void **state)
>+{
>+	struct ldbtest_ctx *ctx = *state;
>+	bool matched = false;
>+	int ret;
>+
>+	uint8_t value[] = "The value.......end";
>+	struct ldb_val val = {
>+		.data   = value,
>+		.length = (sizeof(value))
>+	};
>+	struct ldb_parse_tree *tree = ldb_parse_tree(ctx, "a=*");
>+	assert_non_null(tree);
>+
>+	ret = ldb_wildcard_compare(ctx->ldb, tree, val, &matched);
>+	assert_false(matched);
>+	assert_int_equal(LDB_ERR_INAPPROPRIATE_MATCHING, ret);
>+}
>+
>+/*
>+ * Test basic wild card matching
>+ *
>+ */
>+static void test_wildcard_match(void **state)
>+{
>+	struct ldbtest_ctx *ctx = *state;
>+	bool matched = false;
>+
>+	uint8_t value[] = "The value.......end";
>+	struct ldb_val val = {
>+		.data   = value,
>+		.length = (sizeof(value))
>+	};
>+	struct ldb_parse_tree *tree = ldb_parse_tree(ctx, "objectClass=*end");
>+	assert_non_null(tree);
>+
>+	ldb_wildcard_compare(ctx->ldb, tree, val, &matched);
>+	assert_true(matched);
>+}
>+
>+
>+/*
>+ * ldb_handler_copy and ldb_val_dup over allocate by one and add a trailing '\0'
>+ * to the data, to make them safe to use the C string functions on.
>+ *
>+ * However testing for the trailing '\0' is not the correct way to test for
>+ * the end of a value, the length should be checked instead.
>+ */
>+static void test_wildcard_match_end_condition(void **state)
>+{
>+	struct ldbtest_ctx *ctx = *state;
>+	bool matched = false;
>+
>+	uint8_t value[] = "hellomynameisbobx";
>+	struct ldb_val val = {
>+		.data   = talloc_memdup(NULL, value, sizeof(value)),
>+		.length = (sizeof(value) - 2)
>+	};
>+	struct ldb_parse_tree *tree = ldb_parse_tree(ctx, "a=*hello*mynameis*bob");
>+	assert_non_null(tree);
>+
>+	ldb_wildcard_compare(ctx->ldb, tree, val, &matched);
>+	assert_true(matched);
>+}
>+
>+/*
>+ * Note: to run under valgrind use:
>+ *       valgrind \
>+ *           --suppressions=lib/ldb/tests/ldb_match_test.valgrind \
>+ *           bin/ldb_match_test
>+ */
>+int main(int argc, const char **argv)
>+{
>+	const struct CMUnitTest tests[] = {
>+		cmocka_unit_test_setup_teardown(
>+			test_wildcard_match_star,
>+			setup,
>+			teardown),
>+		cmocka_unit_test_setup_teardown(
>+			test_wildcard_match,
>+			setup,
>+			teardown),
>+		cmocka_unit_test_setup_teardown(
>+			test_wildcard_match_end_condition,
>+			setup,
>+			teardown),
>+	};
>+
>+	return cmocka_run_group_tests(tests, NULL, NULL);
>+}
>diff --git a/lib/ldb/tests/ldb_match_test.valgrind b/lib/ldb/tests/ldb_match_test.valgrind
>new file mode 100644
>index 00000000000..660bd5a6b46
>--- /dev/null
>+++ b/lib/ldb/tests/ldb_match_test.valgrind
>@@ -0,0 +1,16 @@
>+{
>+   Memory allocated in set-up
>+   Memcheck:Leak
>+   match-leak-kinds: possible
>+   fun:malloc
>+   ...
>+   fun:setup
>+}
>+{
>+   Memory allocated by ldb_init
>+   Memcheck:Leak
>+   match-leak-kinds: possible
>+   fun:malloc
>+   ...
>+   fun:ldb_init
>+}
>diff --git a/lib/ldb/wscript b/lib/ldb/wscript
>index 855ee4d556c..cff3ee2d2d3 100644
>--- a/lib/ldb/wscript
>+++ b/lib/ldb/wscript
>@@ -511,6 +511,11 @@ def build(bld):
>                          deps='cmocka ldb',
>                          install=False)
> 
>+        bld.SAMBA_BINARY('ldb_match_test',
>+                         source='tests/ldb_match_test.c',
>+                         deps='cmocka ldb',
>+                         install=False)
>+
>         if bld.CONFIG_SET('HAVE_LMDB'):
>             bld.SAMBA_BINARY('ldb_mdb_mod_op_test',
>                              source='tests/ldb_mod_op_test.c',
>@@ -578,7 +583,8 @@ def test(ctx):
>                  # we don't want to run ldb_lmdb_size_test (which proves we can
>                  # fit > 4G of data into the DB), it would fill up the disk on
>                  # many of our test instances
>-                 'ldb_mdb_kv_ops_test']
>+                 'ldb_mdb_kv_ops_test',
>+                 'ldb_match_test']
> 
>     for test_exe in test_exes:
>             cmd = os.path.join(Context.g_module.out, test_exe)
>-- 
>2.17.1
>
>
>From 87782852b137ea1a9c044200201de24f4e08844b Mon Sep 17 00:00:00 2001
>From: Gary Lockyer <gary@catalyst.net.nz>
>Date: Wed, 20 Feb 2019 09:51:55 +1300
>Subject: [PATCH 8/8] CVE-2019-3824 ldb: Release ldb 1.5.4
>
>* CVE-2019-3824 out of bounds read in wildcard compare (bug 13773)
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13773
>
>Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
>---
> lib/ldb/ABI/ldb-1.5.4.sigs            | 280 ++++++++++++++++++++++++++
> lib/ldb/ABI/pyldb-util-1.5.4.sigs     |   2 +
> lib/ldb/ABI/pyldb-util.py3-1.5.4.sigs |   2 +
> lib/ldb/wscript                       |   2 +-
> 4 files changed, 285 insertions(+), 1 deletion(-)
> create mode 100644 lib/ldb/ABI/ldb-1.5.4.sigs
> create mode 100644 lib/ldb/ABI/pyldb-util-1.5.4.sigs
> create mode 100644 lib/ldb/ABI/pyldb-util.py3-1.5.4.sigs
>
>diff --git a/lib/ldb/ABI/ldb-1.5.4.sigs b/lib/ldb/ABI/ldb-1.5.4.sigs
>new file mode 100644
>index 00000000000..0c1234f1c97
>--- /dev/null
>+++ b/lib/ldb/ABI/ldb-1.5.4.sigs
>@@ -0,0 +1,280 @@
>+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_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_find: const char *(struct ldb_context *, const char **, const char *)
>+ldb_pack_data: int (struct ldb_context *, const struct ldb_message *, struct ldb_val *)
>+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_only_attr_list: int (struct ldb_context *, const struct ldb_val *, struct ldb_message *, const char * const *, unsigned int, unsigned int *)
>+ldb_unpack_data_only_attr_list_flags: int (struct ldb_context *, const struct ldb_val *, struct ldb_message *, const char * const *, unsigned int, unsigned int, unsigned int *)
>+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-1.5.4.sigs b/lib/ldb/ABI/pyldb-util-1.5.4.sigs
>new file mode 100644
>index 00000000000..74d6719d2bc
>--- /dev/null
>+++ b/lib/ldb/ABI/pyldb-util-1.5.4.sigs
>@@ -0,0 +1,2 @@
>+pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
>+pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
>diff --git a/lib/ldb/ABI/pyldb-util.py3-1.5.4.sigs b/lib/ldb/ABI/pyldb-util.py3-1.5.4.sigs
>new file mode 100644
>index 00000000000..74d6719d2bc
>--- /dev/null
>+++ b/lib/ldb/ABI/pyldb-util.py3-1.5.4.sigs
>@@ -0,0 +1,2 @@
>+pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
>+pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
>diff --git a/lib/ldb/wscript b/lib/ldb/wscript
>index cff3ee2d2d3..d3402a7b5b2 100644
>--- a/lib/ldb/wscript
>+++ b/lib/ldb/wscript
>@@ -1,7 +1,7 @@
> #!/usr/bin/env python
> 
> APPNAME = 'ldb'
>-VERSION = '1.5.3'
>+VERSION = '1.5.4'
> 
> import sys, os
> 
>-- 
>2.17.1
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 13773: 14814 | 14815 | 14819 | 14845 | 14852 | 14853 | 14854 | 14855 | 14856 | 14857 | 14858 | 14859