Attachment 9922 Details for Bug 10536 – fix for 4.1, just for completeness, NOT for upstream, cherry-picked from master

[patch] fix for 4.1, just for completeness, NOT for upstream, cherry-picked from master

fix-bug-10536.patches (text/plain), 41.01 KB, created by Björn Baumbach on 2014-05-08 08:59:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2014-05-08 08:59:00 UTC

Size: 41.01 KB

patch

obsolete

>From d1ad1c9b2e71d47dcc9e20f6b71027beb8dd5f84 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 29 Apr 2014 09:32:45 +0200
>Subject: [PATCH 1/7] ldb:pyldb: add some const to PyObject_FromLdbValue()
>
>PyString_FromStringAndSize() makes a copy of the value...
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit aae9da9803dd551364bc3c096e06601bb1c9ed50)
>---
> lib/ldb/pyldb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
>index 8c9d6b9..8ffa78b 100644
>--- a/lib/ldb/pyldb.c
>+++ b/lib/ldb/pyldb.c
>@@ -193,7 +193,7 @@ static void PyErr_SetLdbError(PyObject *error, int ret, struct ldb_context *ldb_
> 				      ldb_ctx == NULL?ldb_strerror(ret):ldb_errstring(ldb_ctx)));
> }
> 
>-static PyObject *PyObject_FromLdbValue(struct ldb_val *val)
>+static PyObject *PyObject_FromLdbValue(const struct ldb_val *val)
> {
> 	return PyString_FromStringAndSize((const char *)val->data, val->length);
> }
>-- 
>1.8.5.5
>
>
>From c8ab51502bbf99467dc0c7cc483e9b6829b8b55c Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 29 Apr 2014 09:34:48 +0200
>Subject: [PATCH 2/7] ldb:pyldb: fix doc string for set_extended_component()
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 094c39107c0abf4951e6f7012ac06b08cae1ea04)
>---
> lib/ldb/pyldb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
>index 8ffa78b..82cb219 100644
>--- a/lib/ldb/pyldb.c
>+++ b/lib/ldb/pyldb.c
>@@ -601,7 +601,7 @@ static PyMethodDef py_ldb_dn_methods[] = {
> 		"S.get_extended_component(name) -> string\n\n"
> 		"returns a DN extended component as a binary string"},
> 	{ "set_extended_component", (PyCFunction)py_ldb_dn_set_extended_component, METH_VARARGS,
>-		"S.set_extended_component(name, value) -> string\n\n"
>+		"S.set_extended_component(name, value) -> None\n\n"
> 		"set a DN extended component as a binary string"},
> 	{ NULL }
> };
>-- 
>1.8.5.5
>
>
>From 460d357cf74d07202ff7e0004fa4a6825457cc10 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 29 Apr 2014 09:35:31 +0200
>Subject: [PATCH 3/7] ldb:pyldb: add some more helper functions for LdbDn
>
>This adds [g|s]et_component[|_name|_value]() and get_rdn_[name|value]().
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 771d7b8c0df9240a9638dbf06a9f04431767bbb8)
>---
> lib/ldb/pyldb.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 112 insertions(+)
>
>diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
>index 82cb219..f23e277 100644
>--- a/lib/ldb/pyldb.c
>+++ b/lib/ldb/pyldb.c
>@@ -556,6 +556,103 @@ static PyObject *py_ldb_dn_is_child_of(PyLdbDnObject *self, PyObject *args)
> 	return PyBool_FromLong(ldb_dn_compare_base(base, dn) == 0);
> }
> 
>+static PyObject *py_ldb_dn_get_component_name(PyLdbDnObject *self, PyObject *args)
>+{
>+	struct ldb_dn *dn;
>+	const char *name;
>+	unsigned int num = 0;
>+
>+	if (!PyArg_ParseTuple(args, "I", &num))
>+		return NULL;
>+
>+	dn = pyldb_Dn_AsDn((PyObject *)self);
>+
>+	name = ldb_dn_get_component_name(dn, num);
>+	if (name == NULL) {
>+		Py_RETURN_NONE;
>+	}
>+
>+	return PyString_FromString(name);
>+}
>+
>+static PyObject *py_ldb_dn_get_component_value(PyLdbDnObject *self, PyObject *args)
>+{
>+	struct ldb_dn *dn;
>+	const struct ldb_val *val;
>+	unsigned int num = 0;
>+
>+	if (!PyArg_ParseTuple(args, "I", &num))
>+		return NULL;
>+
>+	dn = pyldb_Dn_AsDn((PyObject *)self);
>+
>+	val = ldb_dn_get_component_val(dn, num);
>+	if (val == NULL) {
>+		Py_RETURN_NONE;
>+	}
>+
>+	return PyObject_FromLdbValue(val);
>+}
>+
>+static PyObject *py_ldb_dn_set_component(PyLdbDnObject *self, PyObject *args)
>+{
>+	unsigned int num = 0;
>+	char *name = NULL;
>+	PyObject *value = Py_None;
>+	struct ldb_val val = { NULL, };
>+	int err;
>+
>+	if (!PyArg_ParseTuple(args, "IsO", &num, &name, &value))
>+		return NULL;
>+
>+	if (value != Py_None) {
>+		if (!PyString_Check(value)) {
>+			PyErr_SetString(PyExc_TypeError, "Expected a string argument");
>+			return NULL;
>+		}
>+		val.data = (uint8_t *)PyString_AsString(value);
>+		val.length = PyString_Size(value);
>+	}
>+
>+	err = ldb_dn_set_component(self->dn, num, name, val);
>+	if (err != LDB_SUCCESS) {
>+		PyErr_SetString(PyExc_TypeError, "Failed to set component");
>+		return NULL;
>+	}
>+
>+	Py_RETURN_NONE;
>+}
>+
>+static PyObject *py_ldb_dn_get_rdn_name(PyLdbDnObject *self)
>+{
>+	struct ldb_dn *dn;
>+	const char *name;
>+
>+	dn = pyldb_Dn_AsDn((PyObject *)self);
>+
>+	name = ldb_dn_get_rdn_name(dn);
>+	if (name == NULL) {
>+		Py_RETURN_NONE;
>+	}
>+
>+	return PyString_FromString(name);
>+}
>+
>+static PyObject *py_ldb_dn_get_rdn_value(PyLdbDnObject *self)
>+{
>+	struct ldb_dn *dn;
>+	const struct ldb_val *val;
>+
>+	dn = pyldb_Dn_AsDn((PyObject *)self);
>+
>+	val = ldb_dn_get_rdn_val(dn);
>+	if (val == NULL) {
>+		Py_RETURN_NONE;
>+	}
>+
>+	return PyObject_FromLdbValue(val);
>+}
>+
> static PyMethodDef py_ldb_dn_methods[] = {
> 	{ "validate", (PyCFunction)py_ldb_dn_validate, METH_NOARGS, 
> 		"S.validate() -> bool\n"
>@@ -603,6 +700,21 @@ static PyMethodDef py_ldb_dn_methods[] = {
> 	{ "set_extended_component", (PyCFunction)py_ldb_dn_set_extended_component, METH_VARARGS,
> 		"S.set_extended_component(name, value) -> None\n\n"
> 		"set a DN extended component as a binary string"},
>+	{ "get_component_name", (PyCFunction)py_ldb_dn_get_component_name, METH_VARARGS,
>+		"S.get_component_name(num) -> string\n"
>+		"get the attribute name of the specified component" },
>+	{ "get_component_value", (PyCFunction)py_ldb_dn_get_component_value, METH_VARARGS,
>+		"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"
>+		"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"
>+		"get the RDN attribute name" },
>+	{ "get_rdn_value", (PyCFunction)py_ldb_dn_get_rdn_value, METH_NOARGS,
>+		"S.get_rdn_value() -> string\n"
>+		"get the RDN attribute value as a binary string" },
> 	{ NULL }
> };
> 
>-- 
>1.8.5.5
>
>
>From 40bf95b6df7247d0bcd9061e88923bfda8fb98d8 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 29 Apr 2014 09:37:54 +0200
>Subject: [PATCH 4/7] ldb: change version to 1.1.17
>
>This adds some pyldb methods for ldb.Dn.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 7f03a94ffa3752ccdb28cc50033b4e2a26e2b3f2)
>---
> lib/ldb/ABI/ldb-1.1.17.sigs        | 262 +++++++++++++++++++++++++++++++++++++
> lib/ldb/ABI/pyldb-util-1.1.17.sigs |   2 +
> lib/ldb/wscript                    |   2 +-
> 3 files changed, 265 insertions(+), 1 deletion(-)
> create mode 100644 lib/ldb/ABI/ldb-1.1.17.sigs
> create mode 100644 lib/ldb/ABI/pyldb-util-1.1.17.sigs
>
>diff --git a/lib/ldb/ABI/ldb-1.1.17.sigs b/lib/ldb/ABI/ldb-1.1.17.sigs
>new file mode 100644
>index 0000000..eac5194
>--- /dev/null
>+++ b/lib/ldb/ABI/ldb-1.1.17.sigs
>@@ -0,0 +1,262 @@
>+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_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_new: struct ldb_handle *(TALLOC_CTX *, struct ldb_context *)
>+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_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_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_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_remove: void (struct ldb_context *, const char *)
>+ldb_schema_attribute_set_override_handler: void (struct ldb_context *, ldb_attribute_handler_override_fn_t, void *)
>+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_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_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.1.17.sigs b/lib/ldb/ABI/pyldb-util-1.1.17.sigs
>new file mode 100644
>index 0000000..74d6719
>--- /dev/null
>+++ b/lib/ldb/ABI/pyldb-util-1.1.17.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 f5647b1..7e5e6fe 100755
>--- a/lib/ldb/wscript
>+++ b/lib/ldb/wscript
>@@ -1,7 +1,7 @@
> #!/usr/bin/env python
> 
> APPNAME = 'ldb'
>-VERSION = '1.1.16'
>+VERSION = '1.1.17'
> 
> blddir = 'bin'
> 
>-- 
>1.8.5.5
>
>
>From a12f17c02cb491e9883373792d297c9fa5faa96e Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 13 Mar 2014 23:12:39 +0100
>Subject: [PATCH 5/7] dbchecker: make the deleted objects container detection
> more generic
>
>Change-Id: I282ad887c41412e25fdf73476e405f4e88e0b239
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 821d7dc7b33598f72c4518f8975073b058df5960)
>---
> python/samba/dbchecker.py | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
>index 4281e6b..62f9459 100644
>--- a/python/samba/dbchecker.py
>+++ b/python/samba/dbchecker.py
>@@ -1019,6 +1019,13 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>         list_attrs_seen = []
>         got_repl_property_meta_data = False
> 
>+        nc_dn = self.samdb.get_nc_root(obj.dn)
>+        try:
>+            deleted_objects_dn = self.samdb.get_wellknown_dn(nc_dn,
>+                                                 samba.dsdb.DS_GUID_DELETED_OBJECTS_CONTAINER)
>+        except KeyError, e:
>+            deleted_objects_dn = ldb.Dn(self.samdb, "CN=Deleted Objects,%s" % nc_dn)
>+
>         for attrname in obj:
>             if attrname == 'dn':
>                 continue
>@@ -1112,8 +1119,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
> 
>         show_dn = True
>         if got_repl_property_meta_data:
>-            rdn = (str(dn).split(","))[0]
>-            if rdn == "CN=Deleted Objects":
>+            if obj.dn == deleted_objects_dn:
>                 isDeletedAttId = 131120
>                 # It's 29/12/9999 at 23:59:59 UTC as specified in MS-ADTS 7.1.1.4.2 Deleted Objects Container
> 
>-- 
>1.8.5.5
>
>
>From 50c3b1f55861d507d9db620f5e692476715fd395 Mon Sep 17 00:00:00 2001
>From: Felix Botner <botner@univention.de>
>Date: Mon, 24 Feb 2014 14:08:25 +0100
>Subject: [PATCH 6/7] samba-tool dbcheck: handle missing objectClass
>
>In several cases we have seen objects without the objectClass attribute.
>Here the suggestion for a patch to find such objects in "samba-tool dbcheck"
>with the option to delete them.
>
>(patch improved by Andrew Bartlett to suggest DRS re-replication)
>
>Signed-off-by: Felix Botner <botner@univention.de>
>
>Change-Id: I8eb0d191a2089271a9af5884d6bfbf173a5c85c6
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit 5b1d6e722e254522165ec512537a2efa2b979e6f)
>---
> python/samba/dbchecker.py | 31 +++++++++++++++++++++++++++++++
> 1 file changed, 31 insertions(+)
>
>diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
>index 62f9459..3112982 100644
>--- a/python/samba/dbchecker.py
>+++ b/python/samba/dbchecker.py
>@@ -73,6 +73,7 @@ class dbcheck(object):
>         self.ntds_dsa = ldb.Dn(samdb, samdb.get_dsServiceName())
>         self.class_schemaIDGUID = {}
>         self.wellknown_sds = get_wellknown_sds(self.samdb)
>+        self.fix_all_missing_objectclass = False
> 
>         self.name_map = {}
>         try:
>@@ -174,6 +175,18 @@ class dbcheck(object):
>             return False
>         return c
> 
>+    def do_delete(self, dn, controls, msg):
>+        '''delete dn with optional verbose output'''
>+        if self.verbose:
>+            self.report("delete DN %s" % dn)
>+        try:
>+            controls = controls + ["local_oid:%s:0" % dsdb.DSDB_CONTROL_DBCHECK]
>+            self.samdb.delete(dn, controls=controls)
>+        except Exception, err:
>+            self.report("%s : %s" % (msg, err))
>+            return False
>+        return True
>+
>     def do_modify(self, m, controls, msg, validate=True):
>         '''perform a modify with optional verbose output'''
>         if self.verbose:
>@@ -272,6 +285,16 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>         '''see if a dsdb_Dn is the special Deleted Objects DN'''
>         return dsdb_dn.prefix == "B:32:%s:" % dsdb.DS_GUID_DELETED_OBJECTS_CONTAINER
> 
>+    def err_missing_objectclass(self, dn):
>+        """handle object without objectclass"""
>+        self.report("ERROR: missing objectclass in object %s.  If you have another working DC, please run 'samba-tool drs replicate --full-sync --local <destinationDC> <sourceDC> %s'" % (dn, self.samdb.get_nc_root(dn)))
>+        if not self.confirm_all("If you cannot re-sync from another DC, do you wish to delete object '%s'?" % dn, 'fix_all_missing_objectclass'):
>+            self.report("Not deleting object with missing objectclass '%s'" % dn)
>+            return
>+        if self.do_delete(dn, ["relax:0"],
>+                          "Failed to remove DN %s" % dn):
>+            self.report("Removed DN %s" % dn)
>+
>     def err_deleted_dn(self, dn, attrname, val, dsdb_dn, correct_dn):
>         """handle a DN pointing to a deleted object"""
>         self.report("ERROR: target DN is deleted for %s in object %s - %s" % (attrname, dn, val))
>@@ -1018,6 +1041,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>         list_attrs_from_md = []
>         list_attrs_seen = []
>         got_repl_property_meta_data = False
>+        got_objectclass = False
> 
>         nc_dn = self.samdb.get_nc_root(obj.dn)
>         try:
>@@ -1030,6 +1054,9 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>             if attrname == 'dn':
>                 continue
> 
>+            if str(attrname).lower() == 'objectclass':
>+                got_objectclass = True
>+
>             if str(attrname).lower() == 'replpropertymetadata':
>                 if self.has_replmetadata_zero_invocationid(dn, obj[attrname]):
>                     error_count += 1
>@@ -1117,6 +1144,10 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>                     error_count += 1
>                     self.err_wrong_instancetype(obj, calculated_instancetype)
> 
>+        if not got_objectclass and ("*" in attrs or "objectclass" in map(str.lower, attrs)):
>+            error_count += 1
>+            self.err_missing_objectclass(dn)
>+
>         show_dn = True
>         if got_repl_property_meta_data:
>             if obj.dn == deleted_objects_dn:
>-- 
>1.8.5.5
>
>
>From 074ff8a33162386477ed6c3975f87d687beac649 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 13 Mar 2014 23:12:39 +0100
>Subject: [PATCH 7/7] dbchecker: verify and fix broken dn values
>
>With older Samba versions (4.0.x) the following could happen:
>
>- On account was created on DC1
>- It was replicated to DC2
>- The connection between the dcs is offline
>- The account gets modified on DC2
>- The account gets deleted on DC1
>- The connection becomes online again
>- DC1 replicates the modification from DC2,
>  this resets the dn to the original value.
>  'name' and 'cn' are correct (with '\nDEL${GUID}'),
>  but 'dn' is wrong.
>- DC2 replicates the deletion from DC1.
>  this doesn't include a changed dn as DC1
>  had a bug.
>  'name' is correct (with '\nDEL${GUID}'),
>  but 'cn' and 'dn' are wrong.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10536
>Change-Id: Ia70a6c12e0ff0d4c2c8100cb1d8f3c6422b65591
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 709ed040ec161e99b3c1f7076eac4a631149f64a)
>---
> python/samba/dbchecker.py | 94 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 94 insertions(+)
>
>diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
>index 3112982..4b6a1cb 100644
>--- a/python/samba/dbchecker.py
>+++ b/python/samba/dbchecker.py
>@@ -63,6 +63,7 @@ class dbcheck(object):
>         self.fix_instancetype = False
>         self.fix_replmetadata_zero_invocationid = False
>         self.fix_deleted_deleted_objects = False
>+        self.fix_dn = False
>         self.reset_well_known_acls = reset_well_known_acls
>         self.reset_all_well_known_acls = False
>         self.in_transaction = in_transaction
>@@ -486,6 +487,26 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>         else:
>             self.samdb.transaction_cancel()
> 
>+    def err_wrong_dn(self, obj, new_dn, rdn_attr, rdn_val, name_val):
>+        '''handle a wrong dn'''
>+
>+        new_rdn = ldb.Dn(self.samdb, str(new_dn))
>+        new_rdn.remove_base_components(len(new_rdn) - 1)
>+        new_parent = new_dn.parent()
>+
>+        attributes = ""
>+        if rdn_val != name_val:
>+            attributes += "%s=%r " % (rdn_attr, rdn_val)
>+        attributes += "name=%r" % (name_val)
>+
>+        self.report("ERROR: wrong dn[%s] %s new_dn[%s]" % (obj.dn, attributes, new_dn))
>+        if not self.confirm_all("Rename %s to %s?" % (obj.dn, new_dn), 'fix_dn'):
>+            self.report("Not renaming %s to %s" % (obj.dn, new_dn))
>+            return
>+
>+        if self.do_rename(obj.dn, new_rdn, new_parent, ["show_recycled:1", "relax:0"],
>+                          "Failed to rename object %s into %s" % (obj.dn, new_dn)):
>+            self.report("Renamed %s into %s" % (obj.dn, new_dn))
> 
>     def err_wrong_instancetype(self, obj, calculated_instancetype):
>         '''handle a wrong instanceType'''
>@@ -1008,6 +1029,18 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>         '''check one object'''
>         if self.verbose:
>             self.report("Checking object %s" % dn)
>+        rdn0 = (str(dn).split(",", 1))[0]
>+        rdn0_attr = (str(rdn0).split("=", 1))[0]
>+        if "dn" in map(str.lower, attrs):
>+            attrs.append("name")
>+        if "distinguishedname" in map(str.lower, attrs):
>+            attrs.append("name")
>+        if str(rdn0_attr).lower() in map(str.lower, attrs):
>+            attrs.append("name")
>+        if 'name' in map(str.lower, attrs):
>+            attrs.append(rdn0_attr)
>+            attrs.append("isDeleted")
>+            attrs.append("systemFlags")
>         if '*' in attrs:
>             attrs.append("replPropertyMetaData")
> 
>@@ -1050,6 +1083,15 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>         except KeyError, e:
>             deleted_objects_dn = ldb.Dn(self.samdb, "CN=Deleted Objects,%s" % nc_dn)
> 
>+        rdn1_attr = obj.dn.get_rdn_name()
>+        rdn1_val = obj.dn.get_rdn_value()
>+
>+        rdn2_attr = None
>+        rdn2_val = None
>+        name_val = None
>+        isDeleted = False
>+        systemFlags = 0
>+
>         for attrname in obj:
>             if attrname == 'dn':
>                 continue
>@@ -1057,6 +1099,30 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>             if str(attrname).lower() == 'objectclass':
>                 got_objectclass = True
> 
>+            if str(attrname).lower() == "name":
>+                if len(obj[attrname]) != 1:
>+                    error_count += 1
>+                    self.report("ERROR: Not fixing num_values(%d) for '%s' on '%s'" %
>+                                (len(obj[attrname]), attrname, str(obj.dn)))
>+                else:
>+                    name_val = obj[attrname][0]
>+
>+            if str(attrname).lower() == str(rdn1_attr).lower():
>+                rdn2_attr = attrname
>+                if len(obj[attrname]) != 1:
>+                    error_count += 1
>+                    self.report("ERROR: Not fixing num_values(%d) for '%s' on '%s'" %
>+                                (len(obj[attrname]), attrname, str(obj.dn)))
>+                else:
>+                    rdn2_val = obj[attrname][0]
>+
>+            if str(attrname).lower() == 'isdeleted':
>+                if obj[attrname][0] != "FALSE":
>+                    isDeleted = True
>+
>+            if str(attrname).lower() == 'systemflags':
>+                systemFlags = int(obj[attrname][0])
>+
>             if str(attrname).lower() == 'replpropertymetadata':
>                 if self.has_replmetadata_zero_invocationid(dn, obj[attrname]):
>                     error_count += 1
>@@ -1148,6 +1214,34 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>             error_count += 1
>             self.err_missing_objectclass(dn)
> 
>+        if ("*" in attrs or "name" in map(str.lower, attrs)):
>+            if name_val is None:
>+                error_count += 1
>+                self.report("ERROR: Not fixing missing 'name' on '%s'" % (str(obj.dn)))
>+            if rdn2_attr is None:
>+                error_count += 1
>+                self.report("ERROR: Not fixing missing '%s' on '%s'" % (rdn1_attr, str(obj.dn)))
>+
>+        if name_val is not None:
>+            parent_dn = None
>+            if isDeleted:
>+                if not (systemFlags & samba.dsdb.SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE):
>+                    parent_dn = deleted_objects_dn
>+            if parent_dn is None:
>+                parent_dn = obj.dn.parent()
>+            expected_dn = ldb.Dn(self.samdb, "RDN=RDN,%s" % (parent_dn))
>+            expected_dn.set_component(0, rdn1_attr, name_val)
>+
>+            if obj.dn == deleted_objects_dn:
>+                expected_dn = obj.dn
>+
>+            if expected_dn != obj.dn:
>+                error_count += 1
>+                self.err_wrong_dn(obj, expected_dn, rdn2_attr, rdn2_val, name_val)
>+            elif rdn1_val != rdn2_val:
>+                error_count += 1
>+                self.report("ERROR: Not fixing %s=%r on '%s'" % (rdn2_attr, rdn2_val, str(obj.dn)))
>+
>         show_dn = True
>         if got_repl_property_meta_data:
>             if obj.dn == deleted_objects_dn:
>-- 
>1.8.5.5
>

Flags:

metze: review-

Actions: View

Attachments on bug 10536: 9826 | 9922