Attachment 13413 Details for Bug 12901 – Patches for v4-7-test

[patch] Patches for v4-7-test

tmp47.diff.txt (text/plain), 34.47 KB, created by Stefan Metzmacher on 2017-07-22 22:32:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2017-07-22 22:32:22 UTC

Size: 34.47 KB

patch

obsolete

>From e1dccc606dbbee59c6a78703c182a742bb0abec6 Mon Sep 17 00:00:00 2001
>From: Lukas Slebodnik <lslebodn@redhat.com>
>Date: Tue, 4 Jul 2017 00:32:31 +0200
>Subject: [PATCH 1/5] ldb: Use libraries from build dir for testsuite
>
>There was a failure when tests were executed after after extracting
>ldb tarball.
>
>  sh$ make -j8 check
>  WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$PATH waf test
>  ldbadd: error while loading shared libraries: libldb.so.1: cannot open shared object file: No such file or directory
>  cat: write error: Broken pipe
>  Traceback (most recent call last):
>    File "tests/python/api.py", line 10, in <module>
>      import ldb
>  ImportError: libldb.so.1: cannot open shared object file: No such file or directory
>  Traceback (most recent call last):
>    File "tests/python/api.py", line 10, in <module>
>      import ldb
>  ImportError: libpyldb-util.so.1: cannot open shared object file: No such file or directory
>  bin/ldb_tdb_mod_op_test: error while loading shared libraries: libldb.so.1: cannot open shared object file: No such file or directory
>  testsuite returned 1
>
>Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>Signed-off-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit d5d6d209dedd60f8e99d11789f2a0d4e2bf95896)
>---
> lib/ldb/wscript | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/lib/ldb/wscript b/lib/ldb/wscript
>index 32647dd..b4ae62a 100644
>--- a/lib/ldb/wscript
>+++ b/lib/ldb/wscript
>@@ -361,7 +361,10 @@ def test(ctx):
>     shutil.rmtree(test_prefix, ignore_errors=True)
>     os.makedirs(test_prefix)
>     os.environ['TEST_DATA_PREFIX'] = test_prefix
>-    os.environ['LD_LIBRARY_PATH'] = Utils.g_module.blddir + '/bin/default/lib/ldb'
>+    os.environ['LDB_MODULES_PATH'] = Utils.g_module.blddir + "/modules/ldb"
>+    samba_utils.ADD_LD_LIBRARY_PATH('bin/shared')
>+    samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private')
>+
>     cmd = 'tests/test-tdb.sh %s' % Utils.g_module.blddir
>     ret = samba_utils.RUN_COMMAND(cmd)
>     print("testsuite returned %d" % ret)
>@@ -374,8 +377,6 @@ def test(ctx):
>         extra_env={'SELFTEST_PREFIX': test_prefix})
>     print("Python testsuite returned %d" % pyret)
> 
>-    os.environ['LDB_MODULES_PATH'] = Utils.g_module.blddir + '/modules/ldb'
>-    os.environ['LD_LIBRARY_PATH'] = Utils.g_module.blddir + '/bin/default/lib/ldb'
>     cmocka_ret = 0
>     for test_exe in ['ldb_tdb_mod_op_test',
>                      'ldb_msg_test']:
>-- 
>1.9.1
>
>
>From 8502feb6a2a9b0b11c3d51e6de5b16bacb44b30e Mon Sep 17 00:00:00 2001
>From: Lukas Slebodnik <lslebodn@redhat.com>
>Date: Tue, 4 Jul 2017 15:46:49 +0200
>Subject: [PATCH 2/5] ldb: Fix index out of bound in ldb_msg_find_common_values
>
>cmocka unit test failed on i386
>[==========] Running 2 test(s).
>[ RUN      ] test_ldb_msg_find_duplicate_val
>[       OK ] test_ldb_msg_find_duplicate_val
>[ RUN      ] test_ldb_msg_find_common_values
>[  FAILED  ] test_ldb_msg_find_common_values
>[==========] 2 test(s) run.
>[  ERROR   ] --- 0x14 != 0
>[   LINE   ] --- ../tests/ldb_msg.c:266: error: Failure!
>[  PASSED  ] 1 test(s).
>[  FAILED  ] 1 test(s), listed below:
>[  FAILED  ] test_ldb_msg_find_common_values
> 1 FAILED TEST(S)
>
>But we were just lucky on other platforms because there is
>index out of bound according to valgrind error.
>
>==3298== Invalid read of size 4
>==3298==    at 0x486FCF6: ldb_val_cmp (ldb_msg.c:95)
>==3298==    by 0x486FCF6: ldb_msg_find_common_values (ldb_msg.c:266)
>==3298==    by 0x109A3D: test_ldb_msg_find_common_values (ldb_msg.c:265)
>==3298==    by 0x48E7490: ??? (in /usr/lib/libcmocka.so.0.4.1)
>==3298==    by 0x48E7EB0: _cmocka_run_group_tests (in /usr/lib/libcmocka.so.0.4.1)
>==3298==    by 0x1089B7: main (ldb_msg.c:352)
>==3298==  Address 0x4b07734 is 4 bytes after a block of size 48 alloc'd
>==3298==    at 0x483223E: malloc (vg_replace_malloc.c:299)
>==3298==    by 0x4907AA7: _talloc_array (in /usr/lib/libtalloc.so.2.1.9)
>==3298==    by 0x486FBF8: ldb_msg_find_common_values (ldb_msg.c:245)
>==3298==    by 0x109A3D: test_ldb_msg_find_common_values (ldb_msg.c:265)
>==3298==    by 0x48E7490: ??? (in /usr/lib/libcmocka.so.0.4.1)
>==3298==    by 0x48E7EB0: _cmocka_run_group_tests (in /usr/lib/libcmocka.so.0.4.1)
>==3298==    by 0x1089B7: main (ldb_msg.c:352)
>
>Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit 963d9f12f902ae266a8c7edbf4249090de46173b)
>---
> lib/ldb/common/ldb_msg.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
>diff --git a/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c
>index abad5a8..8e4047b 100644
>--- a/lib/ldb/common/ldb_msg.c
>+++ b/lib/ldb/common/ldb_msg.c
>@@ -262,20 +262,12 @@ int ldb_msg_find_common_values(struct ldb_context *ldb,
> 	n_values = el->num_values;
> 	i = 0;
> 	j = 0;
>-	while (i != n_values) {
>+	while (i != n_values && j < el2->num_values) {
> 		int ret = ldb_val_cmp(&values[i], &values2[j]);
> 		if (ret < 0) {
> 			i++;
> 		} else if (ret > 0) {
> 			j++;
>-			if (j == el2->num_values) {
>-				/*
>-				  We have walked past the end of the second
>-				  list, meaning the remainder of the first
>-				  list cannot collide and we're done.
>-				*/
>-				break;
>-			}
> 		} else {
> 			/* we have a collision */
> 			if (! remove_duplicates) {
>-- 
>1.9.1
>
>
>From 283745608b01abf1646299e351b774570b604631 Mon Sep 17 00:00:00 2001
>From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Date: Thu, 6 Jul 2017 10:01:24 +1200
>Subject: [PATCH 3/5] ldb: avoid searching empty lists in
> ldb_msg_find_common_values
>
>Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit 282410fa2416404962521ad6b2598a9c83b63594)
>---
> lib/ldb/common/ldb_msg.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c
>index 8e4047b..c2782db 100644
>--- a/lib/ldb/common/ldb_msg.c
>+++ b/lib/ldb/common/ldb_msg.c
>@@ -207,6 +207,9 @@ int ldb_msg_find_common_values(struct ldb_context *ldb,
> 	if (strcmp(el->name, el2->name) != 0) {
> 		return LDB_ERR_INAPPROPRIATE_MATCHING;
> 	}
>+	if (el->num_values == 0 || el2->num_values == 0) {
>+		return LDB_SUCCESS;
>+	}
> 	/*
> 	   With few values, it is better to do the brute-force search than the
> 	   clever search involving tallocs, memcpys, sorts, etc.
>-- 
>1.9.1
>
>
>From 7ebc55529177fd8747e1d7aeb1911fbfde4427b7 Mon Sep 17 00:00:00 2001
>From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Date: Thu, 6 Jul 2017 12:41:07 +1200
>Subject: [PATCH 4/5] ldb/tests: more thoroughly test empty ldb_msg elements
>
>Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Fri Jul  7 20:10:37 CEST 2017 on sn-devel-144
>
>(cherry picked from commit 4b3de6118569eb9a1d4f233eca112d0d207c1087)
>---
> lib/ldb/tests/ldb_msg.c | 32 +++++++++++++++++++++++++++++---
> 1 file changed, 29 insertions(+), 3 deletions(-)
>
>diff --git a/lib/ldb/tests/ldb_msg.c b/lib/ldb/tests/ldb_msg.c
>index e665d55..f8de418 100644
>--- a/lib/ldb/tests/ldb_msg.c
>+++ b/lib/ldb/tests/ldb_msg.c
>@@ -87,6 +87,11 @@ static void test_ldb_msg_find_duplicate_val(void **state)
> 	ret = ldb_msg_add_empty(msg, "el1", 0, &el);
> 	assert_int_equal(ret, LDB_SUCCESS);
> 
>+	/* An empty message contains no duplicates */
>+	ret = ldb_msg_find_duplicate_val(NULL, test_ctx, el, &dupe, 0);
>+	assert_int_equal(ret, LDB_SUCCESS);
>+	assert_null(dupe);
>+
> 	for (i = 0; i < 5; i++) {
> 		add_uint_value(test_ctx, msg, "el1", i);
> 	}
>@@ -176,19 +181,19 @@ static void _assert_element_equal(struct ldb_message_element *a,
> static void test_ldb_msg_find_common_values(void **state)
> {
> 	/* we only use the state as a talloc context */
>-	struct ldb_message_element *el, *el2, *el3, *el4, *el2b;
>+	struct ldb_message_element *el, *el2, *el3, *el4, *el2b, *empty;
> 	struct ldb_message_element *orig, *orig2, *orig3, *orig4;
> 	int ret;
> 	const uint32_t remove_dupes = LDB_MSG_FIND_COMMON_REMOVE_DUPLICATES;
> 	el = new_msg_element(*state, "test", 0, 4);
> 	el2 = new_msg_element(*state, "test", 4, 4);
> 	el3 = new_msg_element(*state, "test", 6, 4);
>+	empty = new_msg_element(*state, "test", 0, 0);
> 	orig = new_msg_element(*state, "test", 0, 4);
> 	orig2 = new_msg_element(*state, "test", 4, 4);
> 	orig3 = new_msg_element(*state, "test", 6, 4);
> 
> 	/* first round is with short value arrays, using quadratic method */
>-
> 	/* we expect no collisions here */
> 	ret = ldb_msg_find_common_values(NULL, *state, el, el2, 0);
> 	assert_int_equal(ret, LDB_SUCCESS);
>@@ -256,7 +261,7 @@ static void test_ldb_msg_find_common_values(void **state)
> 	assert_element_equal(el2, orig2);
> 	assert_int_equal(el3->num_values, 0);
> 
>-	/* seeing as we have an empty element, try permutations therewith.
>+	/* permutations involving empty elements.
> 	   everything should succeed. */
> 	ret = ldb_msg_find_common_values(NULL, *state, el3, el2, 0);
> 	assert_int_equal(ret, LDB_SUCCESS);
>@@ -264,10 +269,19 @@ static void test_ldb_msg_find_common_values(void **state)
> 	assert_int_equal(ret, LDB_SUCCESS);
> 	ret = ldb_msg_find_common_values(NULL, *state, el2, el3, 0);
> 	assert_int_equal(ret, LDB_SUCCESS);
>+	assert_int_equal(el2->num_values, orig2->num_values);
> 	ret = ldb_msg_find_common_values(NULL, *state, el3, el2, remove_dupes);
> 	assert_int_equal(ret, LDB_SUCCESS);
>+	assert_int_equal(el2->num_values, orig2->num_values);
>+	assert_int_equal(el3->num_values, 0); /* el3 is now empty */
> 	ret = ldb_msg_find_common_values(NULL, *state, el2, el3, remove_dupes);
> 	assert_int_equal(ret, LDB_SUCCESS);
>+	ret = ldb_msg_find_common_values(NULL, *state, el3, empty, 0);
>+	assert_int_equal(ret, LDB_SUCCESS);
>+	ret = ldb_msg_find_common_values(NULL, *state, empty, empty, 0);
>+	assert_int_equal(ret, LDB_SUCCESS);
>+	ret = ldb_msg_find_common_values(NULL, *state, empty, el3, 0);
>+	assert_int_equal(ret, LDB_SUCCESS);
> 
> 	assert_element_equal(el2, orig2);
> 	assert_element_equal(el, orig);
>@@ -329,6 +343,18 @@ static void test_ldb_msg_find_common_values(void **state)
> 	orig2 = new_msg_element(*state, "test", 12, 2);
> 	assert_element_equal(el2, orig2);
> 
>+	/* test the empty el against the full elements */
>+	ret = ldb_msg_find_common_values(NULL, *state, el, empty, 0);
>+	assert_int_equal(ret, LDB_SUCCESS);
>+	ret = ldb_msg_find_common_values(NULL, *state, empty, el, 0);
>+	assert_int_equal(ret, LDB_SUCCESS);
>+	ret = ldb_msg_find_common_values(NULL, *state, el, empty, remove_dupes);
>+	assert_int_equal(ret, LDB_SUCCESS);
>+	ret = ldb_msg_find_common_values(NULL, *state, empty, el, remove_dupes);
>+	assert_int_equal(ret, LDB_SUCCESS);
>+	assert_element_equal(el, orig);
>+	assert_element_equal(empty, el3);
>+
> 	/* make sure an identical element with a different name is rejected */
> 	el2 = new_msg_element(*state, "fish", 12, 2);
> 	ret = ldb_msg_find_common_values(NULL, *state, el2, el, remove_dupes);
>-- 
>1.9.1
>
>
>From 1a210c9fa29e2656cb2eac456e4d1fa5e92c5b5a Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 21 Jul 2017 14:36:08 +0200
>Subject: [PATCH 5/5] ldb: version 1.2.1
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>* Bug #12882: Do not install _ldb_text.py if we have system libldb
>* Use libraries from build dir for testsuite
>* Bug #12900: Fix index out of bound in ldb_msg_find_common_values
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Sat Jul 22 03:46:25 CEST 2017 on sn-devel-144
>
>(cherry picked from commit 19dfccea744a843511d9c4ca2b5adbd648284250)
>---
> lib/ldb/ABI/ldb-1.2.1.sigs            | 276 ++++++++++++++++++++++++++++++++++
> lib/ldb/ABI/pyldb-util-1.2.1.sigs     |   2 +
> lib/ldb/ABI/pyldb-util.py3-1.2.1.sigs |   2 +
> lib/ldb/wscript                       |   2 +-
> 4 files changed, 281 insertions(+), 1 deletion(-)
> create mode 100644 lib/ldb/ABI/ldb-1.2.1.sigs
> create mode 100644 lib/ldb/ABI/pyldb-util-1.2.1.sigs
> create mode 100644 lib/ldb/ABI/pyldb-util.py3-1.2.1.sigs
>
>diff --git a/lib/ldb/ABI/ldb-1.2.1.sigs b/lib/ldb/ABI/ldb-1.2.1.sigs
>new file mode 100644
>index 0000000..1be2ae7
>--- /dev/null
>+++ b/lib/ldb/ABI/ldb-1.2.1.sigs
>@@ -0,0 +1,276 @@
>+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_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_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_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_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.2.1.sigs b/lib/ldb/ABI/pyldb-util-1.2.1.sigs
>new file mode 100644
>index 0000000..74d6719
>--- /dev/null
>+++ b/lib/ldb/ABI/pyldb-util-1.2.1.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.2.1.sigs b/lib/ldb/ABI/pyldb-util.py3-1.2.1.sigs
>new file mode 100644
>index 0000000..74d6719
>--- /dev/null
>+++ b/lib/ldb/ABI/pyldb-util.py3-1.2.1.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 b4ae62a..6f3b326 100644
>--- a/lib/ldb/wscript
>+++ b/lib/ldb/wscript
>@@ -1,7 +1,7 @@
> #!/usr/bin/env python
> 
> APPNAME = 'ldb'
>-VERSION = '1.2.0'
>+VERSION = '1.2.1'
> 
> blddir = 'bin'
> 
>-- 
>1.9.1
>

Flags:

abartlet: review+
metze: review? (slow)

Actions: View

Attachments on bug 12901: 13413