ldb: make ldb a top level library for Samba 4.0

Signed-off-by: Andrew Tridgell <tridge@samba.org>

5 files changed, 0 insertions, 3652 deletions

diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c
deleted file mode 100644
index d35e5c604f..0000000000
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ /dev/null
@@ -1,1139 +0,0 @@
-/*
-   ldb database mapping module
-
-   Copyright (C) Jelmer Vernooij 2005
-   Copyright (C) Martin Kuehl <mkhl@samba.org> 2006
-   Copyright (C) Simo Sorce 2008
-
-     ** NOTE! The following LGPL license applies to the ldb
-     ** library. This does NOT imply that all of Samba is released
-     ** under the LGPL
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   This library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-/* 
- *  Name: ldb
- *
- *  Component: ldb ldb_map module
- *
- *  Description: Map portions of data into a different format on a
- *  remote partition.
- *
- *  Author: Jelmer Vernooij, Martin Kuehl
- */
-
-#include "replace.h"
-#include "system/filesys.h"
-#include "system/time.h"
-#include "ldb_map.h"
-#include "ldb_map_private.h"
-
-#ifndef _PUBLIC_
-#define _PUBLIC_
-#endif
-
-/* Description of the provided ldb requests:
- - special attribute 'isMapped'
-
- - search:
-     - if parse tree can be split
-         - search remote records w/ remote attrs and parse tree
-     - otherwise
-         - enumerate all remote records
-     - for each remote result
-         - map remote result to local message
-         - search local result
-         - is present
-             - merge local into remote result
-             - run callback on merged result
-         - otherwise
-             - run callback on remote result
-
- - add:
-     - split message into local and remote part
-     - if local message is not empty
-         - add isMapped to local message
-         - add local message
-     - add remote message
-
- - modify:
-     - split message into local and remote part
-     - if local message is not empty
-         - add isMapped to local message
-         - search for local record
-         - if present
-             - modify local record
-         - otherwise
-             - add local message
-     - modify remote record
-
- - delete:
-     - search for local record
-     - if present
-         - delete local record
-     - delete remote record
-
- - rename:
-     - search for local record
-     - if present
-         - rename local record
-         - modify local isMapped
-     - rename remote record
-*/
-
-
-
-/* Private data structures
- * ======================= */
-
-/* Global private data */
-/* Extract mappings from private data. */
-const struct ldb_map_context *map_get_context(struct ldb_module *module)
-{
-	const struct map_private *data = talloc_get_type(ldb_module_get_private(module), struct map_private);
-	return data->context;
-}
-
-/* Create a generic request context. */
-struct map_context *map_init_context(struct ldb_module *module,
-					struct ldb_request *req)
-{
-	struct ldb_context *ldb;
-	struct map_context *ac;
-
-	ldb = ldb_module_get_ctx(module);
-
-	ac = talloc_zero(req, struct map_context);
-	if (ac == NULL) {
-		ldb_set_errstring(ldb, "Out of Memory");
-		return NULL;
-	}
-
-	ac->module = module;
-	ac->req = req;
-
-	return ac;
-}
-
-/* Dealing with DNs for different partitions
- * ========================================= */
-
-/* Check whether any data should be stored in the local partition. */
-bool map_check_local_db(struct ldb_module *module)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-
-	if (!data->remote_base_dn || !data->local_base_dn) {
-		return false;
-	}
-
-	return true;
-}
-
-/* Copy a DN with the base DN of the local partition. */
-static struct ldb_dn *ldb_dn_rebase_local(void *mem_ctx, const struct ldb_map_context *data, struct ldb_dn *dn)
-{
-	struct ldb_dn *new_dn;
-
-	new_dn = ldb_dn_copy(mem_ctx, dn);
-	if ( ! ldb_dn_validate(new_dn)) {
-		talloc_free(new_dn);
-		return NULL;
-	}
-
-	/* may be we don't need to rebase at all */
-	if ( ! data->remote_base_dn || ! data->local_base_dn) {
-		return new_dn;
-	}
-
-	if ( ! ldb_dn_remove_base_components(new_dn, ldb_dn_get_comp_num(data->remote_base_dn))) {
-		talloc_free(new_dn);
-		return NULL;
-	}
-
-	if ( ! ldb_dn_add_base(new_dn, data->local_base_dn)) {
-		talloc_free(new_dn);
-		return NULL;
-	}
-
-	return new_dn;
-}
-
-/* Copy a DN with the base DN of the remote partition. */
-static struct ldb_dn *ldb_dn_rebase_remote(void *mem_ctx, const struct ldb_map_context *data, struct ldb_dn *dn)
-{
-	struct ldb_dn *new_dn;
-
-	new_dn = ldb_dn_copy(mem_ctx, dn);
-	if ( ! ldb_dn_validate(new_dn)) {
-		talloc_free(new_dn);
-		return NULL;
-	}
-
-	/* may be we don't need to rebase at all */
-	if ( ! data->remote_base_dn || ! data->local_base_dn) {
-		return new_dn;
-	}
-
-	if ( ! ldb_dn_remove_base_components(new_dn, ldb_dn_get_comp_num(data->local_base_dn))) {
-		talloc_free(new_dn);
-		return NULL;
-	}
-
-	if ( ! ldb_dn_add_base(new_dn, data->remote_base_dn)) {
-		talloc_free(new_dn);
-		return NULL;
-	}
-
-	return new_dn;
-}
-
-/* Run a request and make sure it targets the remote partition. */
-/* TODO: free old DNs and messages? */
-int ldb_next_remote_request(struct ldb_module *module, struct ldb_request *request)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	struct ldb_context *ldb;
-	struct ldb_message *msg;
-
-	ldb = ldb_module_get_ctx(module);
-
-	switch (request->operation) {
-	case LDB_SEARCH:
-		if (request->op.search.base) {
-			request->op.search.base = ldb_dn_rebase_remote(request, data, request->op.search.base);
-		} else {
-			request->op.search.base = data->remote_base_dn;
-			/* TODO: adjust scope? */
-		}
-		break;
-
-	case LDB_ADD:
-		msg = ldb_msg_copy_shallow(request, request->op.add.message);
-		msg->dn = ldb_dn_rebase_remote(msg, data, msg->dn);
-		request->op.add.message = msg;
-		break;
-
-	case LDB_MODIFY:
-		msg = ldb_msg_copy_shallow(request, request->op.mod.message);
-		msg->dn = ldb_dn_rebase_remote(msg, data, msg->dn);
-		request->op.mod.message = msg;
-		break;
-
-	case LDB_DELETE:
-		request->op.del.dn = ldb_dn_rebase_remote(request, data, request->op.del.dn);
-		break;
-
-	case LDB_RENAME:
-		request->op.rename.olddn = ldb_dn_rebase_remote(request, data, request->op.rename.olddn);
-		request->op.rename.newdn = ldb_dn_rebase_remote(request, data, request->op.rename.newdn);
-		break;
-
-	default:
-		ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-			  "Invalid remote request!");
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return ldb_next_request(module, request);
-}
-
-
-/* Finding mappings for attributes and objectClasses
- * ================================================= */
-
-/* Find an objectClass mapping by the local name. */
-static const struct ldb_map_objectclass *map_objectclass_find_local(const struct ldb_map_context *data, const char *name)
-{
-	unsigned int i;
-
-	for (i = 0; data->objectclass_maps && data->objectclass_maps[i].local_name; i++) {
-		if (ldb_attr_cmp(data->objectclass_maps[i].local_name, name) == 0) {
-			return &data->objectclass_maps[i];
-		}
-	}
-
-	return NULL;
-}
-
-/* Find an objectClass mapping by the remote name. */
-static const struct ldb_map_objectclass *map_objectclass_find_remote(const struct ldb_map_context *data, const char *name)
-{
-	unsigned int i;
-
-	for (i = 0; data->objectclass_maps && data->objectclass_maps[i].remote_name; i++) {
-		if (ldb_attr_cmp(data->objectclass_maps[i].remote_name, name) == 0) {
-			return &data->objectclass_maps[i];
-		}
-	}
-
-	return NULL;
-}
-
-/* Find an attribute mapping by the local name. */
-const struct ldb_map_attribute *map_attr_find_local(const struct ldb_map_context *data, const char *name)
-{
-	unsigned int i;
-
-	for (i = 0; data->attribute_maps[i].local_name; i++) {
-		if (ldb_attr_cmp(data->attribute_maps[i].local_name, name) == 0) {
-			return &data->attribute_maps[i];
-		}
-	}
-	for (i = 0; data->attribute_maps[i].local_name; i++) {
-		if (ldb_attr_cmp(data->attribute_maps[i].local_name, "*") == 0) {
-			return &data->attribute_maps[i];
-		}
-	}
-
-	return NULL;
-}
-
-/* Find an attribute mapping by the remote name. */
-const struct ldb_map_attribute *map_attr_find_remote(const struct ldb_map_context *data, const char *name)
-{
-	const struct ldb_map_attribute *map;
-	const struct ldb_map_attribute *wildcard = NULL;
-	unsigned int i, j;
-
-	for (i = 0; data->attribute_maps[i].local_name; i++) {
-		map = &data->attribute_maps[i];
-		if (ldb_attr_cmp(map->local_name, "*") == 0) {
-			wildcard = &data->attribute_maps[i];
-		}
-
-		switch (map->type) {
-		case LDB_MAP_IGNORE:
-			break;
-
-		case LDB_MAP_KEEP:
-			if (ldb_attr_cmp(map->local_name, name) == 0) {
-				return map;
-			}
-			break;
-
-		case LDB_MAP_RENAME:
-		case LDB_MAP_CONVERT:
-			if (ldb_attr_cmp(map->u.rename.remote_name, name) == 0) {
-				return map;
-			}
-			break;
-
-		case LDB_MAP_GENERATE:
-			for (j = 0; map->u.generate.remote_names && map->u.generate.remote_names[j]; j++) {
-				if (ldb_attr_cmp(map->u.generate.remote_names[j], name) == 0) {
-					return map;
-				}
-			}
-			break;
-		}
-	}
-
-	/* We didn't find it, so return the wildcard record if one was configured */
-	return wildcard;
-}
-
-
-/* Mapping attributes
- * ================== */
-
-/* Check whether an attribute will be mapped into the remote partition. */
-bool map_attr_check_remote(const struct ldb_map_context *data, const char *attr)
-{
-	const struct ldb_map_attribute *map = map_attr_find_local(data, attr);
-
-	if (map == NULL) {
-		return false;
-	}
-	if (map->type == LDB_MAP_IGNORE) {
-		return false;
-	}
-
-	return true;
-}
-
-/* Map an attribute name into the remote partition. */
-const char *map_attr_map_local(void *mem_ctx, const struct ldb_map_attribute *map, const char *attr)
-{
-	if (map == NULL) {
-		return talloc_strdup(mem_ctx, attr);
-	}
-
-	switch (map->type) {
-	case LDB_MAP_KEEP:
-		return talloc_strdup(mem_ctx, attr);
-
-	case LDB_MAP_RENAME:
-	case LDB_MAP_CONVERT:
-		return talloc_strdup(mem_ctx, map->u.rename.remote_name);
-
-	default:
-		return NULL;
-	}
-}
-
-/* Map an attribute name back into the local partition. */
-const char *map_attr_map_remote(void *mem_ctx, const struct ldb_map_attribute *map, const char *attr)
-{
-	if (map == NULL) {
-		return talloc_strdup(mem_ctx, attr);
-	}
-
-	if (map->type == LDB_MAP_KEEP) {
-		return talloc_strdup(mem_ctx, attr);
-	}
-
-	return talloc_strdup(mem_ctx, map->local_name);
-}
-
-
-/* Merge two lists of attributes into a single one. */
-int map_attrs_merge(struct ldb_module *module, void *mem_ctx, 
-		    const char ***attrs, const char * const *more_attrs)
-{
-	unsigned int i, j, k;
-
-	for (i = 0; *attrs && (*attrs)[i]; i++) /* noop */ ;
-	for (j = 0; more_attrs && more_attrs[j]; j++) /* noop */ ;
-	
-	*attrs = talloc_realloc(mem_ctx, *attrs, const char *, i+j+1);
-	if (*attrs == NULL) {
-		map_oom(module);
-		return -1;
-	}
-
-	for (k = 0; k < j; k++) {
-		(*attrs)[i + k] = more_attrs[k];
-	}
-
-	(*attrs)[i+k] = NULL;
-
-	return 0;
-}
-
-/* Mapping ldb values
- * ================== */
-
-/* Map an ldb value into the remote partition. */
-struct ldb_val ldb_val_map_local(struct ldb_module *module, void *mem_ctx, 
-				 const struct ldb_map_attribute *map, const struct ldb_val *val)
-{
-	if (map && (map->type == LDB_MAP_CONVERT) && (map->u.convert.convert_local)) {
-		return map->u.convert.convert_local(module, mem_ctx, val);
-	}
-
-	return ldb_val_dup(mem_ctx, val);
-}
-
-/* Map an ldb value back into the local partition. */
-struct ldb_val ldb_val_map_remote(struct ldb_module *module, void *mem_ctx, 
-				  const struct ldb_map_attribute *map, const struct ldb_val *val)
-{
-	if (map && (map->type == LDB_MAP_CONVERT) && (map->u.convert.convert_remote)) {
-		return map->u.convert.convert_remote(module, mem_ctx, val);
-	}
-
-	return ldb_val_dup(mem_ctx, val);
-}
-
-
-/* Mapping DNs
- * =========== */
-
-/* Check whether a DN is below the local baseDN. */
-bool ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-
-	if (!data->local_base_dn) {
-		return true;
-	}
-
-	return ldb_dn_compare_base(data->local_base_dn, dn) == 0;
-}
-
-/* Map a DN into the remote partition. */
-struct ldb_dn *ldb_dn_map_local(struct ldb_module *module, void *mem_ctx, struct ldb_dn *dn)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	struct ldb_context *ldb;
-	struct ldb_dn *newdn;
-	const struct ldb_map_attribute *map;
-	enum ldb_map_attr_type map_type;
-	const char *name;
-	struct ldb_val value;
-	int i, ret;
-
-	if (dn == NULL) {
-		return NULL;
-	}
-
-	ldb = ldb_module_get_ctx(module);
-
-	newdn = ldb_dn_copy(mem_ctx, dn);
-	if (newdn == NULL) {
-		map_oom(module);
-		return NULL;
-	}
-
-	/* For each RDN, map the component name and possibly the value */
-	for (i = 0; i < ldb_dn_get_comp_num(newdn); i++) {
-		map = map_attr_find_local(data, ldb_dn_get_component_name(dn, i));
-
-		/* Unknown attribute - leave this RDN as is and hope the best... */
-		if (map == NULL) {
-			map_type = LDB_MAP_KEEP;
-		} else {
-			map_type = map->type;
-		}
-
-		switch (map_type) {
-		case LDB_MAP_IGNORE:
-		case LDB_MAP_GENERATE:
-			ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-				  "LDB_MAP_IGNORE/LDB_MAP_GENERATE attribute '%s' "
-				  "used in DN!", ldb_dn_get_component_name(dn, i));
-			goto failed;
-
-		case LDB_MAP_CONVERT:
-			if (map->u.convert.convert_local == NULL) {
-				ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-					  "'convert_local' not set for attribute '%s' "
-					  "used in DN!", ldb_dn_get_component_name(dn, i));
-				goto failed;
-			}
-			/* fall through */
-		case LDB_MAP_KEEP:
-		case LDB_MAP_RENAME:
-			name = map_attr_map_local(newdn, map, ldb_dn_get_component_name(dn, i));
-			if (name == NULL) goto failed;
-
-			value = ldb_val_map_local(module, newdn, map, ldb_dn_get_component_val(dn, i));
-			if (value.data == NULL) goto failed;
-
-			ret = ldb_dn_set_component(newdn, i, name, value);
-			if (ret != LDB_SUCCESS) {
-				goto failed;
-			}
-
-			break;
-		}
-	}
-
-	return newdn;
-
-failed:
-	talloc_free(newdn);
-	return NULL;
-}
-
-/* Map a DN into the local partition. */
-struct ldb_dn *ldb_dn_map_remote(struct ldb_module *module, void *mem_ctx, struct ldb_dn *dn)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	struct ldb_context *ldb;
-	struct ldb_dn *newdn;
-	const struct ldb_map_attribute *map;
-	enum ldb_map_attr_type map_type;
-	const char *name;
-	struct ldb_val value;
-	int i, ret;
-
-	if (dn == NULL) {
-		return NULL;
-	}
-
-	ldb = ldb_module_get_ctx(module);
-
-	newdn = ldb_dn_copy(mem_ctx, dn);
-	if (newdn == NULL) {
-		map_oom(module);
-		return NULL;
-	}
-
-	/* For each RDN, map the component name and possibly the value */
-	for (i = 0; i < ldb_dn_get_comp_num(newdn); i++) {
-		map = map_attr_find_remote(data, ldb_dn_get_component_name(dn, i));
-
-		/* Unknown attribute - leave this RDN as is and hope the best... */
-		if (map == NULL) {
-			map_type = LDB_MAP_KEEP;
-		} else {
-			map_type = map->type;
-		}
-
-		switch (map_type) {
-		case LDB_MAP_IGNORE:
-		case LDB_MAP_GENERATE:
-			ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-				  "LDB_MAP_IGNORE/LDB_MAP_GENERATE attribute '%s' "
-				  "used in DN!", ldb_dn_get_component_name(dn, i));
-			goto failed;
-
-		case LDB_MAP_CONVERT:
-			if (map->u.convert.convert_remote == NULL) {
-				ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-					  "'convert_remote' not set for attribute '%s' "
-					  "used in DN!", ldb_dn_get_component_name(dn, i));
-				goto failed;
-			}
-			/* fall through */
-		case LDB_MAP_KEEP:
-		case LDB_MAP_RENAME:
-			name = map_attr_map_remote(newdn, map, ldb_dn_get_component_name(dn, i));
-			if (name == NULL) goto failed;
-
-			value = ldb_val_map_remote(module, newdn, map, ldb_dn_get_component_val(dn, i));
-			if (value.data == NULL) goto failed;
-
-			ret = ldb_dn_set_component(newdn, i, name, value);
-			if (ret != LDB_SUCCESS) {
-				goto failed;
-			}
-
-			break;
-		}
-	}
-
-	return newdn;
-
-failed:
-	talloc_free(newdn);
-	return NULL;
-}
-
-/* Map a DN and its base into the local partition. */
-/* TODO: This should not be required with GUIDs. */
-struct ldb_dn *ldb_dn_map_rebase_remote(struct ldb_module *module, void *mem_ctx, struct ldb_dn *dn)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	struct ldb_dn *dn1, *dn2;
-
-	dn1 = ldb_dn_rebase_local(mem_ctx, data, dn);
-	dn2 = ldb_dn_map_remote(module, mem_ctx, dn1);
-
-	talloc_free(dn1);
-	return dn2;
-}
-
-
-/* Converting DNs and objectClasses (as ldb values)
- * ================================================ */
-
-/* Map a DN contained in an ldb value into the remote partition. */
-static struct ldb_val ldb_dn_convert_local(struct ldb_module *module, void *mem_ctx, const struct ldb_val *val)
-{
-	struct ldb_context *ldb;
-	struct ldb_dn *dn, *newdn;
-	struct ldb_val newval;
-
-	ldb = ldb_module_get_ctx(module);
-
-	dn = ldb_dn_from_ldb_val(mem_ctx, ldb, val);
-	if (! ldb_dn_validate(dn)) {
-		newval.length = 0;
-		newval.data = NULL;
-		talloc_free(dn);
-		return newval;
-	}
-	newdn = ldb_dn_map_local(module, mem_ctx, dn);
-	talloc_free(dn);
-
-	newval.length = 0;
-	newval.data = (uint8_t *)ldb_dn_alloc_linearized(mem_ctx, newdn);
-	if (newval.data) {
-		newval.length = strlen((char *)newval.data);
-	}
-	talloc_free(newdn);
-
-	return newval;
-}
-
-/* Map a DN contained in an ldb value into the local partition. */
-static struct ldb_val ldb_dn_convert_remote(struct ldb_module *module, void *mem_ctx, const struct ldb_val *val)
-{
-	struct ldb_context *ldb;
-	struct ldb_dn *dn, *newdn;
-	struct ldb_val newval;
-
-	ldb = ldb_module_get_ctx(module);
-
-	dn = ldb_dn_from_ldb_val(mem_ctx, ldb, val);
-	if (! ldb_dn_validate(dn)) {
-		newval.length = 0;
-		newval.data = NULL;
-		talloc_free(dn);
-		return newval;
-	}
-	newdn = ldb_dn_map_remote(module, mem_ctx, dn);
-	talloc_free(dn);
-
-	newval.length = 0;
-	newval.data = (uint8_t *)ldb_dn_alloc_linearized(mem_ctx, newdn);
-	if (newval.data) {
-		newval.length = strlen((char *)newval.data);
-	}
-	talloc_free(newdn);
-
-	return newval;
-}
-
-/* Map an objectClass into the remote partition. */
-static struct ldb_val map_objectclass_convert_local(struct ldb_module *module, void *mem_ctx, const struct ldb_val *val)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	const char *name = (char *)val->data;
-	const struct ldb_map_objectclass *map = map_objectclass_find_local(data, name);
-	struct ldb_val newval;
-
-	if (map) {
-		newval.data = (uint8_t*)talloc_strdup(mem_ctx, map->remote_name);
-		newval.length = strlen((char *)newval.data);
-		return newval;
-	}
-
-	return ldb_val_dup(mem_ctx, val);
-}
-
-/* Generate a remote message with a mapped objectClass. */
-static void map_objectclass_generate_remote(struct ldb_module *module, const char *local_attr, const struct ldb_message *old, struct ldb_message *remote, struct ldb_message *local)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	struct ldb_context *ldb;
-	struct ldb_message_element *el, *oc;
-	struct ldb_val val;
-	bool found_extensibleObject = false;
-	unsigned int i;
-
-	ldb = ldb_module_get_ctx(module);
-
-	/* Find old local objectClass */
-	oc = ldb_msg_find_element(old, "objectClass");
-	if (oc == NULL) {
-		return;
-	}
-
-	/* Prepare new element */
-	el = talloc_zero(remote, struct ldb_message_element);
-	if (el == NULL) {
-		ldb_oom(ldb);
-		return;			/* TODO: fail? */
-	}
-
-	/* Copy local objectClass element, reverse space for an extra value */
-	el->num_values = oc->num_values + 1;
-	el->values = talloc_array(el, struct ldb_val, el->num_values);
-	if (el->values == NULL) {
-		talloc_free(el);
-		ldb_oom(ldb);
-		return;			/* TODO: fail? */
-	}
-
-	/* Copy local element name "objectClass" */
-	el->name = talloc_strdup(el, local_attr);
-
-	/* Convert all local objectClasses */
-	for (i = 0; i < el->num_values - 1; i++) {
-		el->values[i] = map_objectclass_convert_local(module, el->values, &oc->values[i]);
-		if (ldb_attr_cmp((char *)el->values[i].data, data->add_objectclass) == 0) {
-			found_extensibleObject = true;
-		}
-	}
-
-	if (!found_extensibleObject) {
-		val.data = (uint8_t *)talloc_strdup(el->values, data->add_objectclass);
-		val.length = strlen((char *)val.data);
-
-		/* Append additional objectClass data->add_objectclass */
-		el->values[i] = val;
-	} else {
-		el->num_values--;
-	}
-
-	/* Add new objectClass to remote message */
-	ldb_msg_add(remote, el, 0);
-}
-
-/* Map an objectClass into the local partition. */
-static struct ldb_val map_objectclass_convert_remote(struct ldb_module *module, void *mem_ctx, const struct ldb_val *val)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	const char *name = (char *)val->data;
-	const struct ldb_map_objectclass *map = map_objectclass_find_remote(data, name);
-	struct ldb_val newval;
-
-	if (map) {
-		newval.data = (uint8_t*)talloc_strdup(mem_ctx, map->local_name);
-		newval.length = strlen((char *)newval.data);
-		return newval;
-	}
-
-	return ldb_val_dup(mem_ctx, val);
-}
-
-/* Generate a local message with a mapped objectClass. */
-static struct ldb_message_element *map_objectclass_generate_local(struct ldb_module *module, void *mem_ctx, const char *local_attr, const struct ldb_message *remote)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	struct ldb_context *ldb;
-	struct ldb_message_element *el, *oc;
-	struct ldb_val val;
-	unsigned int i;
-
-	ldb = ldb_module_get_ctx(module);
-
-	/* Find old remote objectClass */
-	oc = ldb_msg_find_element(remote, "objectClass");
-	if (oc == NULL) {
-		return NULL;
-	}
-
-	/* Prepare new element */
-	el = talloc_zero(mem_ctx, struct ldb_message_element);
-	if (el == NULL) {
-		ldb_oom(ldb);
-		return NULL;
-	}
-
-	/* Copy remote objectClass element */
-	el->num_values = oc->num_values;
-	el->values = talloc_array(el, struct ldb_val, el->num_values);
-	if (el->values == NULL) {
-		talloc_free(el);
-		ldb_oom(ldb);
-		return NULL;
-	}
-
-	/* Copy remote element name "objectClass" */
-	el->name = talloc_strdup(el, local_attr);
-
-	/* Convert all remote objectClasses */
-	for (i = 0; i < el->num_values; i++) {
-		el->values[i] = map_objectclass_convert_remote(module, el->values, &oc->values[i]);
-	}
-
-	val.data = (uint8_t *)talloc_strdup(el->values, data->add_objectclass);
-	val.length = strlen((char *)val.data);
-
-	/* Remove last value if it was the string in data->add_objectclass (eg samba4top, extensibleObject) */
-	if (ldb_val_equal_exact(&val, &el->values[i-1])) {
-		el->num_values--;
-		el->values = talloc_realloc(el, el->values, struct ldb_val, el->num_values);
-		if (el->values == NULL) {
-			talloc_free(el);
-			ldb_oom(ldb);
-			return NULL;
-		}
-	}
-
-	return el;
-}
-
-static const struct ldb_map_attribute objectclass_convert_map = {
-	.local_name = "objectClass",
-	.type = LDB_MAP_CONVERT,
-	.u = {
-		.convert = {
-			.remote_name = "objectClass",
-			.convert_local = map_objectclass_convert_local,
-			.convert_remote = map_objectclass_convert_remote,
-		},
-	},
-};
-
-
-/* Mappings for searches on objectClass= assuming a one-to-one
- * mapping.  Needed because this is a generate operator for the
- * add/modify code */
-static int map_objectclass_convert_operator(struct ldb_module *module, void *mem_ctx, 
-					    struct ldb_parse_tree **new, const struct ldb_parse_tree *tree) 
-{
-	
-	return map_subtree_collect_remote_simple(module, mem_ctx, new, tree, &objectclass_convert_map);
-}
-
-/* Auxiliary request construction
- * ============================== */
-
-/* Build a request to search a record by its DN. */
-struct ldb_request *map_search_base_req(struct map_context *ac, struct ldb_dn *dn, const char * const *attrs, const struct ldb_parse_tree *tree, void *context, ldb_map_callback_t callback)
-{
-	const struct ldb_parse_tree *search_tree;
-	struct ldb_context *ldb;
-	struct ldb_request *req;
-	int ret;
-
-	ldb = ldb_module_get_ctx(ac->module);
-
-	if (tree) {
-		search_tree = tree;
-	} else {
-		search_tree = ldb_parse_tree(ac, NULL);
-		if (search_tree == NULL) {
-			return NULL;
-		}
-	}
-
-	ret = ldb_build_search_req_ex(&req, ldb, ac,
-					dn, LDB_SCOPE_BASE,
-					search_tree, attrs,
-					NULL,
-					context, callback,
-					ac->req);
-	LDB_REQ_SET_LOCATION(req);
-	if (ret != LDB_SUCCESS) {
-		return NULL;
-	}
-
-	return req;
-}
-
-/* Build a request to update the 'IS_MAPPED' attribute */
-struct ldb_request *map_build_fixup_req(struct map_context *ac,
-					struct ldb_dn *olddn,
-					struct ldb_dn *newdn,
-					void *context,
-					ldb_map_callback_t callback)
-{
-	struct ldb_context *ldb;
-	struct ldb_request *req;
-	struct ldb_message *msg;
-	const char *dn;
-	int ret;
-
-	ldb = ldb_module_get_ctx(ac->module);
-
-	/* Prepare message */
-	msg = ldb_msg_new(ac);
-	if (msg == NULL) {
-		map_oom(ac->module);
-		return NULL;
-	}
-
-	/* Update local 'IS_MAPPED' to the new remote DN */
-	msg->dn = ldb_dn_copy(msg, olddn);
-	dn = ldb_dn_alloc_linearized(msg, newdn);
-	if ( ! dn || ! ldb_dn_validate(msg->dn)) {
-		goto failed;
-	}
-	if (ldb_msg_add_empty(msg, IS_MAPPED, LDB_FLAG_MOD_REPLACE, NULL) != 0) {
-		goto failed;
-	}
-	if (ldb_msg_add_string(msg, IS_MAPPED, dn) != 0) {
-		goto failed;
-	}
-
-	/* Prepare request */
-	ret = ldb_build_mod_req(&req, ldb,
-				ac, msg, NULL,
-				context, callback,
-				ac->req);
-	LDB_REQ_SET_LOCATION(req);
-	if (ret != LDB_SUCCESS) {
-		goto failed;
-	}
-	talloc_steal(req, msg);
-
-	return req;
-failed:
-	talloc_free(msg);
-	return NULL;
-}
-
-/* Module initialization
- * ===================== */
-
-
-/* Builtin mappings for DNs and objectClasses */
-static const struct ldb_map_attribute builtin_attribute_maps[] = {
-	{
-		.local_name = "dn",
-		.type = LDB_MAP_CONVERT,
-		.u = {
-			.convert = {
-				 .remote_name = "dn",
-				 .convert_local = ldb_dn_convert_local,
-				 .convert_remote = ldb_dn_convert_remote,
-			 },
-		},
-	},
-	{
-		.local_name = NULL,
-	}
-};
-
-static const struct ldb_map_attribute objectclass_attribute_map	= {
-	.local_name = "objectClass",
-	.type = LDB_MAP_GENERATE,
-	.convert_operator = map_objectclass_convert_operator,
-	.u = {
-		.generate = {
-			.remote_names = { "objectClass", NULL },
-			.generate_local = map_objectclass_generate_local,
-			.generate_remote = map_objectclass_generate_remote,
-		},
-	},
-};
-
-
-/* Find the special 'MAP_DN_NAME' record and store local and remote
- * base DNs in private data. */
-static int map_init_dns(struct ldb_module *module, struct ldb_map_context *data, const char *name)
-{
-	static const char * const attrs[] = { MAP_DN_FROM, MAP_DN_TO, NULL };
-	struct ldb_context *ldb;
-	struct ldb_dn *dn;
-	struct ldb_message *msg;
-	struct ldb_result *res;
-	int ret;
-
-	if (!name) {
-		data->local_base_dn = NULL;
-		data->remote_base_dn = NULL;
-		return LDB_SUCCESS;
-	}
-
-	ldb = ldb_module_get_ctx(module);
-
-	dn = ldb_dn_new_fmt(data, ldb, "%s=%s", MAP_DN_NAME, name);
-	if ( ! ldb_dn_validate(dn)) {
-		ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-			  "Failed to construct '%s' DN!", MAP_DN_NAME);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	ret = ldb_search(ldb, data, &res, dn, LDB_SCOPE_BASE, attrs, NULL);
-	talloc_free(dn);
-	if (ret != LDB_SUCCESS) {
-		return ret;
-	}
-	if (res->count == 0) {
-		ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-			  "No results for '%s=%s'!", MAP_DN_NAME, name);
-		talloc_free(res);
-		return LDB_ERR_CONSTRAINT_VIOLATION;
-	}
-	if (res->count > 1) {
-		ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-			  "Too many results for '%s=%s'!", MAP_DN_NAME, name);
-		talloc_free(res);
-		return LDB_ERR_CONSTRAINT_VIOLATION;
-	}
-
-	msg = res->msgs[0];
-	data->local_base_dn = ldb_msg_find_attr_as_dn(ldb, data, msg, MAP_DN_FROM);
-	data->remote_base_dn = ldb_msg_find_attr_as_dn(ldb, data, msg, MAP_DN_TO);
-	talloc_free(res);
-
-	return LDB_SUCCESS;
-}
-
-/* Store attribute maps and objectClass maps in private data. */
-static int map_init_maps(struct ldb_module *module, struct ldb_map_context *data, 
-			 const struct ldb_map_attribute *attrs, 
-			 const struct ldb_map_objectclass *ocls, 
-			 const char * const *wildcard_attributes)
-{
-	unsigned int i, j, last;
-	last = 0;
-
-	/* Count specified attribute maps */
-	for (i = 0; attrs[i].local_name; i++) /* noop */ ;
-	/* Count built-in attribute maps */
-	for (j = 0; builtin_attribute_maps[j].local_name; j++) /* noop */ ;
-
-	/* Store list of attribute maps */
-	data->attribute_maps = talloc_array(data, struct ldb_map_attribute, i+j+2);
-	if (data->attribute_maps == NULL) {
-		map_oom(module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* Specified ones go first */
-	for (i = 0; attrs[i].local_name; i++) {
-		data->attribute_maps[last] = attrs[i];
-		last++;
-	}
-
-	/* Built-in ones go last */
-	for (i = 0; builtin_attribute_maps[i].local_name; i++) {
-		data->attribute_maps[last] = builtin_attribute_maps[i];
-		last++;
-	}
-
-	if (data->add_objectclass) {
-		/* ObjectClass one is very last, if required */
-		data->attribute_maps[last] = objectclass_attribute_map;
-		last++;
-	} else if (ocls) {
-		data->attribute_maps[last] = objectclass_convert_map;
-		last++;
-	}
-
-	/* Ensure 'local_name == NULL' for the last entry */
-	memset(&data->attribute_maps[last], 0, sizeof(struct ldb_map_attribute));
-
-	/* Store list of objectClass maps */
-	data->objectclass_maps = ocls;
-
-	data->wildcard_attributes = wildcard_attributes;
-
-	return LDB_SUCCESS;
-}
-
-/* Initialize global private data. */
-_PUBLIC_ int ldb_map_init(struct ldb_module *module, const struct ldb_map_attribute *attrs, 
-			  const struct ldb_map_objectclass *ocls,
-			  const char * const *wildcard_attributes,
-			  const char *add_objectclass,
-			  const char *name)
-{
-	struct map_private *data;
-	int ret;
-
-	/* Prepare private data */
-	data = talloc_zero(module, struct map_private);
-	if (data == NULL) {
-		map_oom(module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	ldb_module_set_private(module, data);
-
-	data->context = talloc_zero(data, struct ldb_map_context);
-	if (!data->context) {
-		map_oom(module);
-		return LDB_ERR_OPERATIONS_ERROR;		
-	}
-
-	/* Store local and remote baseDNs */
-	ret = map_init_dns(module, data->context, name);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(data);
-		return ret;
-	}
-
-	data->context->add_objectclass = add_objectclass;
-
-	/* Store list of attribute and objectClass maps */
-	ret = map_init_maps(module, data->context, attrs, ocls, wildcard_attributes);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(data);
-		return ret;
-	}
-
-	return LDB_SUCCESS;
-}
diff --git a/source4/lib/ldb/ldb_map/ldb_map.h b/source4/lib/ldb/ldb_map/ldb_map.h
deleted file mode 100644
index 5db3e02a08..0000000000
--- a/source4/lib/ldb/ldb_map/ldb_map.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-   ldb database mapping module
-
-   Copyright (C) Jelmer Vernooij 2005
-   Copyright (C) Martin Kuehl <mkhl@samba.org> 2006
-
-     ** NOTE! The following LGPL license applies to the ldb
-     ** library. This does NOT imply that all of Samba is released
-     ** under the LGPL
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   This library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef __LDB_MAP_H__
-#define __LDB_MAP_H__
-
-#include "ldb_module.h"
-
-/* ldb_map is a skeleton LDB module that can be used for any other modules
- * that need to map attributes.
- *
- * The term 'remote' in this header refers to the connection where the 
- * original schema is used on while 'local' means the local connection 
- * that any upper layers will use.
- *
- * All local attributes will have to have a definition. Not all remote 
- * attributes need a definition as LDB is a lot less strict than LDAP 
- * (in other words, sending unknown attributes to an LDAP server hurts us, 
- * while returning too many attributes in ldb_search() doesn't)
- */
-
-
-/* Name of the internal attribute pointing from the local to the
- * remote part of a record */
-#define IS_MAPPED "isMapped"
-
-
-struct ldb_map_context;
-
-/* convert a local ldb_val to a remote ldb_val */
-typedef struct ldb_val (*ldb_map_convert_func) (struct ldb_module *module, void *mem_ctx, const struct ldb_val *val);
-
-#define LDB_MAP_MAX_REMOTE_NAMES 10
-
-/* map from local to remote attribute */
-struct ldb_map_attribute {
-	const char *local_name; /* local name */
-
-	enum ldb_map_attr_type { 
-		LDB_MAP_IGNORE, /* Ignore this local attribute. Doesn't exist remotely.  */
-		LDB_MAP_KEEP,   /* Keep as is. Same name locally and remotely. */
-		LDB_MAP_RENAME, /* Simply rename the attribute. Name changes, data is the same */
-		LDB_MAP_CONVERT, /* Rename + convert data */
-		LDB_MAP_GENERATE /* Use generate function for generating new name/data.
-						Used for generating attributes based on 
-						multiple remote attributes. */
-	} type;
-	
-	/* if set, will be called for search expressions that contain this attribute */
-	int (*convert_operator)(struct ldb_module *, TALLOC_CTX *ctx, struct ldb_parse_tree **ntree, const struct ldb_parse_tree *otree);
-
-	union { 
-		struct {
-			const char *remote_name;
-		} rename;
-		
-		struct {
-			const char *remote_name;
-
-			/* Convert local to remote data */
-			ldb_map_convert_func convert_local;
-
-			/* Convert remote to local data */
-			/* an entry can have convert_remote set to NULL, as long as there as an entry with the same local_name 
-			 * that is non-NULL before it. */
-			ldb_map_convert_func convert_remote;
-		} convert;
-	
-		struct {
-			/* Generate the local attribute from remote message */
-			struct ldb_message_element *(*generate_local)(struct ldb_module *, TALLOC_CTX *mem_ctx, const char *remote_attr, const struct ldb_message *remote);
-
-			/* Update remote message with information from local message */
-			void (*generate_remote)(struct ldb_module *, const char *local_attr, const struct ldb_message *old, struct ldb_message *remote, struct ldb_message *local);
-
-			/* Name(s) for this attribute on the remote server. This is an array since 
-			 * one local attribute's data can be split up into several attributes 
-			 * remotely */
-			const char *remote_names[LDB_MAP_MAX_REMOTE_NAMES];
-
-			/* Names of additional remote attributes
-			 * required for the generation.	 NULL
-			 * indicates that `local_attr' suffices. */
-			/*
-#define LDB_MAP_MAX_SELF_ATTRIBUTES 10
-			const char *self_attrs[LDB_MAP_MAX_SELF_ATTRIBUTES];
-			*/
-		} generate;
-	} u;
-};
-
-
-#define LDB_MAP_MAX_SUBCLASSES	10
-#define LDB_MAP_MAX_MUSTS		10
-#define LDB_MAP_MAX_MAYS		50
-
-/* map from local to remote objectClass */
-struct ldb_map_objectclass {
-	const char *local_name;
-	const char *remote_name;
-	const char *base_classes[LDB_MAP_MAX_SUBCLASSES];
-	const char *musts[LDB_MAP_MAX_MUSTS];
-	const char *mays[LDB_MAP_MAX_MAYS];
-};
-
-
-/* private context data */
-struct ldb_map_context {
-	struct ldb_map_attribute *attribute_maps;
-	/* NOTE: Always declare base classes first here */
-	const struct ldb_map_objectclass *objectclass_maps;
-
-	/* Remote (often operational) attributes that should be added
-	 * to any wildcard search */
-	const char * const *wildcard_attributes;
-
-	/* ObjectClass (if any) to be added to remote attributes on add */
-	const char *add_objectclass;
-
-	/* struct ldb_context *mapped_ldb; */
-	struct ldb_dn *local_base_dn;
-	struct ldb_dn *remote_base_dn;
-};
-
-/* Global private data */
-struct map_private {
-	void *caller_private;
-	struct ldb_map_context *context;
-};
-
-/* Initialize global private data. */
-int ldb_map_init(struct ldb_module *module, const struct ldb_map_attribute *attrs, 
-		 const struct ldb_map_objectclass *ocls,
-		 const char * const *wildcard_attributes,
-		 const char *add_objectclass,
-		 const char *name);
-
-int ldb_map_add(struct ldb_module *module, struct ldb_request *req);
-int ldb_map_search(struct ldb_module *module, struct ldb_request *req);
-int ldb_map_rename(struct ldb_module *module, struct ldb_request *req);
-int ldb_map_delete(struct ldb_module *module, struct ldb_request *req);
-int ldb_map_modify(struct ldb_module *module, struct ldb_request *req);
-
-#define LDB_MAP_OPS \
-	.add		= ldb_map_add, \
-	.modify		= ldb_map_modify, \
-	.del		= ldb_map_delete, \
-	.rename		= ldb_map_rename, \
-	.search		= ldb_map_search,
-
-#endif /* __LDB_MAP_H__ */
diff --git a/source4/lib/ldb/ldb_map/ldb_map_inbound.c b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
deleted file mode 100644
index b61037222a..0000000000
--- a/source4/lib/ldb/ldb_map/ldb_map_inbound.c
+++ /dev/null
@@ -1,837 +0,0 @@
-/*
-   ldb database mapping module
-
-   Copyright (C) Jelmer Vernooij 2005
-   Copyright (C) Martin Kuehl <mkhl@samba.org> 2006
-   Copyright (C) Simo Sorce <idra@samba.org> 2008
-
-     ** NOTE! The following LGPL license applies to the ldb
-     ** library. This does NOT imply that all of Samba is released
-     ** under the LGPL
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   This library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "replace.h"
-#include "system/filesys.h"
-#include "system/time.h"
-#include "ldb_map.h"
-#include "ldb_map_private.h"
-
-
-/* Mapping message elements
- * ======================== */
-
-/* Map a message element into the remote partition. */
-static struct ldb_message_element *ldb_msg_el_map_local(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, const struct ldb_message_element *old)
-{
-	struct ldb_message_element *el;
-	unsigned int i;
-
-	el = talloc_zero(mem_ctx, struct ldb_message_element);
-	if (el == NULL) {
-		map_oom(module);
-		return NULL;
-	}
-
-	el->num_values = old->num_values;
-	el->values = talloc_array(el, struct ldb_val, el->num_values);
-	if (el->values == NULL) {
-		talloc_free(el);
-		map_oom(module);
-		return NULL;
-	}
-
-	el->name = map_attr_map_local(el, map, old->name);
-
-	for (i = 0; i < el->num_values; i++) {
-		el->values[i] = ldb_val_map_local(module, el->values, map, &old->values[i]);
-	}
-
-	return el;
-}
-
-/* Add a message element either to a local or to a remote message,
- * depending on whether it goes into the local or remote partition. */
-static int ldb_msg_el_partition(struct ldb_module *module, struct ldb_message *local, struct ldb_message *remote, const struct ldb_message *msg, const char *attr_name, /* const char * const names[], */ const struct ldb_message_element *old)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	const struct ldb_map_attribute *map = map_attr_find_local(data, attr_name);
-	struct ldb_message_element *el=NULL;
-	struct ldb_context *ldb = ldb_module_get_ctx(module);
-
-	/* Unknown attribute: ignore */
-	if (map == NULL) {
-		ldb_debug(ldb, LDB_DEBUG_WARNING, "ldb_map: "
-			  "Not mapping attribute '%s': no mapping found",
-			  old->name);
-		goto local;
-	}
-
-	switch (map->type) {
-	case LDB_MAP_IGNORE:
-		goto local;
-
-	case LDB_MAP_CONVERT:
-		if (map->u.convert.convert_local == NULL) {
-			ldb_debug(ldb, LDB_DEBUG_WARNING, "ldb_map: "
-				  "Not mapping attribute '%s': "
-				  "'convert_local' not set",
-				  map->local_name);
-			goto local;
-		}
-		/* fall through */
-	case LDB_MAP_KEEP:
-	case LDB_MAP_RENAME:
-		el = ldb_msg_el_map_local(module, remote, map, old);
-		break;
-
-	case LDB_MAP_GENERATE:
-		if (map->u.generate.generate_remote == NULL) {
-			ldb_debug(ldb, LDB_DEBUG_WARNING, "ldb_map: "
-				  "Not mapping attribute '%s': "
-				  "'generate_remote' not set",
-				  map->local_name);
-			goto local;
-		}
-
-		/* TODO: if this attr requires context:
-		 *	 make sure all context attrs are mappable (in 'names')
-		 *	 make sure all context attrs have already been mapped?
-		 *	 maybe postpone generation until they have been mapped?
-		 */
-
-		map->u.generate.generate_remote(module, map->local_name, msg, remote, local);
-		return 0;
-	}
-
-	if (el == NULL) {
-		return -1;
-	}
-
-	return ldb_msg_add(remote, el, old->flags);
-
-local:
-	el = talloc(local, struct ldb_message_element);
-	if (el == NULL) {
-		map_oom(module);
-		return -1;
-	}
-
-	*el = *old;			/* copy the old element */
-
-	return ldb_msg_add(local, el, old->flags);
-}
-
-/* Mapping messages
- * ================ */
-
-/* Check whether a message will be (partially) mapped into the remote partition. */
-static bool ldb_msg_check_remote(struct ldb_module *module, const struct ldb_message *msg)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	bool ret;
-	unsigned int i;
-
-	for (i = 0; i < msg->num_elements; i++) {
-		ret = map_attr_check_remote(data, msg->elements[i].name);
-		if (ret) {
-			return ret;
-		}
-	}
-
-	return false;
-}
-
-/* Split message elements that stay in the local partition from those
- * that are mapped into the remote partition. */
-static int ldb_msg_partition(struct ldb_module *module, struct ldb_message *local, struct ldb_message *remote, const struct ldb_message *msg)
-{
-	/* const char * const names[]; */
-	struct ldb_context *ldb;
-	unsigned int i;
-	int ret;
-
-	ldb = ldb_module_get_ctx(module);
-
-	for (i = 0; i < msg->num_elements; i++) {
-		/* Skip 'IS_MAPPED' */
-		if (ldb_attr_cmp(msg->elements[i].name, IS_MAPPED) == 0) {
-			ldb_debug(ldb, LDB_DEBUG_WARNING, "ldb_map: "
-				  "Skipping attribute '%s'",
-				  msg->elements[i].name);
-			continue;
-		}
-
-		ret = ldb_msg_el_partition(module, local, remote, msg, msg->elements[i].name, &msg->elements[i]);
-		if (ret) {
-			return ret;
-		}
-	}
-
-	return 0;
-}
-
-
-static int map_add_do_local(struct map_context *ac);
-static int map_modify_do_local(struct map_context *ac);
-static int map_delete_do_local(struct map_context *ac);
-static int map_rename_do_local(struct map_context *ac);
-static int map_rename_do_fixup(struct map_context *ac);
-static int map_rename_local_callback(struct ldb_request *req,
-				     struct ldb_reply *ares);
-
-
-/*****************************************************************************
- * COMMON INBOUND functions
-*****************************************************************************/
-
-/* Store the DN of a single search result in context. */
-static int map_search_self_callback(struct ldb_request *req, struct ldb_reply *ares)
-{
-	struct ldb_context *ldb;
-	struct map_context *ac;
-	int ret;
-
-	ac = talloc_get_type(req->context, struct map_context);
-	ldb = ldb_module_get_ctx(ac->module);
-
-	if (!ares) {
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-	if (ares->error != LDB_SUCCESS) {
-		return ldb_module_done(ac->req, ares->controls,
-					ares->response, ares->error);
-	}
-
-	/* We are interested only in the single reply */
-	switch(ares->type) {
-	case LDB_REPLY_ENTRY:
-		/* We have already found a remote DN */
-		if (ac->local_dn) {
-			ldb_set_errstring(ldb,
-					  "Too many results!");
-			return ldb_module_done(ac->req, NULL, NULL,
-						LDB_ERR_OPERATIONS_ERROR);
-		}
-
-		/* Store local DN */
-		ac->local_dn = talloc_steal(ac, ares->message->dn);
-		break;
-
-	case LDB_REPLY_DONE:
-
-		switch (ac->req->operation) {
-		case LDB_MODIFY:
-			ret = map_modify_do_local(ac);
-			break;
-		case LDB_DELETE:
-			ret = map_delete_do_local(ac);
-			break;
-		case LDB_RENAME:
-			ret = map_rename_do_local(ac);
-			break;
-		default:
-			/* if we get here we have definitely a problem */
-			ret = LDB_ERR_OPERATIONS_ERROR;
-		}
-		if (ret != LDB_SUCCESS) {
-			return ldb_module_done(ac->req, NULL, NULL,
-						LDB_ERR_OPERATIONS_ERROR);
-		}
-
-	default:
-		/* ignore referrals */
-		break;
-	}
-
-	talloc_free(ares);
-	return LDB_SUCCESS;
-}
-
-/* Build a request to search the local record by its DN. */
-static int map_search_self_req(struct ldb_request **req,
-				struct map_context *ac,
-				struct ldb_dn *dn)
-{
-	/* attrs[] is returned from this function in
-	 * ac->search_req->op.search.attrs, so it must be static, as
-	 * otherwise the compiler can put it on the stack */
-	static const char * const attrs[] = { IS_MAPPED, NULL };
-	struct ldb_parse_tree *tree;
-
-	/* Limit search to records with 'IS_MAPPED' present */
-	tree = ldb_parse_tree(ac, "(" IS_MAPPED "=*)");
-	if (tree == NULL) {
-		map_oom(ac->module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	*req = map_search_base_req(ac, dn, attrs, tree,
-				   ac, map_search_self_callback);
-	if (*req == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return LDB_SUCCESS;
-}
-
-static int map_op_local_callback(struct ldb_request *req,
-				 struct ldb_reply *ares)
-{
-	struct ldb_context *ldb;
-	struct map_context *ac;
-	int ret;
-
-	ac = talloc_get_type(req->context, struct map_context);
-	ldb = ldb_module_get_ctx(ac->module);
-
-	if (!ares) {
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-	if (ares->error != LDB_SUCCESS) {
-		return ldb_module_done(ac->req, ares->controls,
-					ares->response, ares->error);
-	}
-
-	if (ares->type != LDB_REPLY_DONE) {
-		ldb_set_errstring(ldb, "Invalid reply type!");
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-
-	/* Do the remote request. */
-	ret = ldb_next_remote_request(ac->module, ac->remote_req);
-	if (ret != LDB_SUCCESS) {
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-
-	return LDB_SUCCESS;
-}
-
-static int map_op_remote_callback(struct ldb_request *req,
-				  struct ldb_reply *ares)
-{
-	struct ldb_context *ldb;
-	struct map_context *ac;
-
-	ac = talloc_get_type(req->context, struct map_context);
-	ldb = ldb_module_get_ctx(ac->module);
-
-	if (!ares) {
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-	if (ares->error != LDB_SUCCESS) {
-		return ldb_module_done(ac->req, ares->controls,
-					ares->response, ares->error);
-	}
-
-	if (ares->type != LDB_REPLY_DONE) {
-		ldb_set_errstring(ldb, "Invalid reply type!");
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-
-	return ldb_module_done(ac->req, ares->controls,
-					ares->response, ares->error);
-}
-
-
-/*****************************************************************************
- * ADD operations
-*****************************************************************************/
-
-
-/* Add a record. */
-int ldb_map_add(struct ldb_module *module, struct ldb_request *req)
-{
-	const struct ldb_message *msg = req->op.add.message;
-	struct ldb_context *ldb;
-	struct map_context *ac;
-	struct ldb_message *remote_msg;
-	int ret;
-
-	ldb = ldb_module_get_ctx(module);
-
-	/* Do not manipulate our control entries */
-	if (ldb_dn_is_special(msg->dn)) {
-		return ldb_next_request(module, req);
-	}
-
-	/* No mapping requested (perhaps no DN mapping specified), skip to next module */
-	if (!ldb_dn_check_local(module, msg->dn)) {
-		return ldb_next_request(module, req);
-	}
-
-	/* No mapping needed, fail */
-	if (!ldb_msg_check_remote(module, msg)) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* Prepare context and handle */
-	ac = map_init_context(module, req);
-	if (ac == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-
-	/* Prepare the local message */
-	ac->local_msg = ldb_msg_new(ac);
-	if (ac->local_msg == NULL) {
-		map_oom(module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	ac->local_msg->dn = msg->dn;
-
-	/* Prepare the remote message */
-	remote_msg = ldb_msg_new(ac);
-	if (remote_msg == NULL) {
-		map_oom(module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	remote_msg->dn = ldb_dn_map_local(ac->module, remote_msg, msg->dn);
-
-	/* Split local from remote message */
-	ldb_msg_partition(module, ac->local_msg, remote_msg, msg);
-
-	/* Prepare the remote operation */
-	ret = ldb_build_add_req(&ac->remote_req, ldb,
-				ac, remote_msg,
-				req->controls,
-				ac, map_op_remote_callback,
-				req);
-	LDB_REQ_SET_LOCATION(ac->remote_req);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	if ((ac->local_msg->num_elements == 0) ||
-	    ( ! map_check_local_db(ac->module))) {
-		/* No local data or db, just run the remote request */
-		return ldb_next_remote_request(ac->module, ac->remote_req);
-	}
-
-	/* Store remote DN in 'IS_MAPPED' */
-	/* TODO: use GUIDs here instead */
-	ret = ldb_msg_add_linearized_dn(ac->local_msg, IS_MAPPED,
-					remote_msg->dn);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return map_add_do_local(ac);
-}
-
-/* Add the local record. */
-static int map_add_do_local(struct map_context *ac)
-{
-	struct ldb_request *local_req;
-	struct ldb_context *ldb;
-	int ret;
-
-	ldb = ldb_module_get_ctx(ac->module);
-
-	/* Prepare the local operation */
-	ret = ldb_build_add_req(&local_req, ldb, ac,
-				ac->local_msg,
-				ac->req->controls,
-				ac,
-				map_op_local_callback,
-				ac->req);
-	LDB_REQ_SET_LOCATION(local_req);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	return ldb_next_request(ac->module, local_req);
-}
-
-/*****************************************************************************
- * MODIFY operations
-*****************************************************************************/
-
-/* Modify a record. */
-int ldb_map_modify(struct ldb_module *module, struct ldb_request *req)
-{
-	const struct ldb_message *msg = req->op.mod.message;
-	struct ldb_request *search_req;
-	struct ldb_message *remote_msg;
-	struct ldb_context *ldb;
-	struct map_context *ac;
-	int ret;
-
-	ldb = ldb_module_get_ctx(module);
-
-	/* Do not manipulate our control entries */
-	if (ldb_dn_is_special(msg->dn)) {
-		return ldb_next_request(module, req);
-	}
-
-	/* No mapping requested (perhaps no DN mapping specified), skip to next module */
-	if (!ldb_dn_check_local(module, msg->dn)) {
-		return ldb_next_request(module, req);
-	}
-
-	/* No mapping needed, skip to next module */
-	/* TODO: What if the remote part exists, the local doesn't,
-	 *	 and this request wants to modify local data and thus
-	 *	 add the local record? */
-	if (!ldb_msg_check_remote(module, msg)) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* Prepare context and handle */
-	ac = map_init_context(module, req);
-	if (ac == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* Prepare the local message */
-	ac->local_msg = ldb_msg_new(ac);
-	if (ac->local_msg == NULL) {
-		map_oom(module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	ac->local_msg->dn = msg->dn;
-
-	/* Prepare the remote message */
-	remote_msg = ldb_msg_new(ac->remote_req);
-	if (remote_msg == NULL) {
-		map_oom(module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	remote_msg->dn = ldb_dn_map_local(ac->module, remote_msg, msg->dn);
-
-	/* Split local from remote message */
-	ldb_msg_partition(module, ac->local_msg, remote_msg, msg);
-
-	/* Prepare the remote operation */
-	ret = ldb_build_mod_req(&ac->remote_req, ldb,
-				ac, remote_msg,
-				req->controls,
-				ac, map_op_remote_callback,
-				req);
-	LDB_REQ_SET_LOCATION(ac->remote_req);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	if ((ac->local_msg->num_elements == 0) ||
-	    ( ! map_check_local_db(ac->module))) {
-		/* No local data or db, just run the remote request */
-		return ldb_next_remote_request(ac->module, ac->remote_req);
-	}
-
-	/* prepare the search operation */
-	ret = map_search_self_req(&search_req, ac, msg->dn);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return ldb_next_request(module, search_req);
-}
-
-/* Modify the local record. */
-static int map_modify_do_local(struct map_context *ac)
-{
-	struct ldb_request *local_req;
-	struct ldb_context *ldb;
-	int ret;
-
-	ldb = ldb_module_get_ctx(ac->module);
-
-	if (ac->local_dn == NULL) {
-		/* No local record present, add it instead */
-		/* Add local 'IS_MAPPED' */
-		/* TODO: use GUIDs here instead */
-		if (ldb_msg_add_empty(ac->local_msg, IS_MAPPED,
-					LDB_FLAG_MOD_ADD, NULL) != 0) {
-			return LDB_ERR_OPERATIONS_ERROR;
-		}
-		ret = ldb_msg_add_linearized_dn(ac->local_msg, IS_MAPPED,
-						ac->remote_req->op.mod.message->dn);
-		if (ret != 0) {
-			return LDB_ERR_OPERATIONS_ERROR;
-		}
-
-		/* Prepare the local operation */
-		ret = ldb_build_add_req(&local_req, ldb, ac,
-					ac->local_msg,
-					ac->req->controls,
-					ac,
-					map_op_local_callback,
-					ac->req);
-		LDB_REQ_SET_LOCATION(local_req);
-		if (ret != LDB_SUCCESS) {
-			return LDB_ERR_OPERATIONS_ERROR;
-		}
-	} else {
-		/* Prepare the local operation */
-		ret = ldb_build_mod_req(&local_req, ldb, ac,
-					ac->local_msg,
-					ac->req->controls,
-					ac,
-					map_op_local_callback,
-					ac->req);
-		LDB_REQ_SET_LOCATION(local_req);
-		if (ret != LDB_SUCCESS) {
-			return LDB_ERR_OPERATIONS_ERROR;
-		}
-	}
-
-	return ldb_next_request(ac->module, local_req);
-}
-
-/*****************************************************************************
- * DELETE operations
-*****************************************************************************/
-
-/* Delete a record. */
-int ldb_map_delete(struct ldb_module *module, struct ldb_request *req)
-{
-	struct ldb_request *search_req;
-	struct ldb_context *ldb;
-	struct map_context *ac;
-	int ret;
-
-	ldb = ldb_module_get_ctx(module);
-
-	/* Do not manipulate our control entries */
-	if (ldb_dn_is_special(req->op.del.dn)) {
-		return ldb_next_request(module, req);
-	}
-
-	/* No mapping requested (perhaps no DN mapping specified).
-	 * Skip to next module */
-	if (!ldb_dn_check_local(module, req->op.del.dn)) {
-		return ldb_next_request(module, req);
-	}
-
-	/* Prepare context and handle */
-	ac = map_init_context(module, req);
-	if (ac == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* Prepare the remote operation */
-	ret = ldb_build_del_req(&ac->remote_req, ldb, ac,
-				   ldb_dn_map_local(module, ac, req->op.del.dn),
-				   req->controls,
-				   ac,
-				   map_op_remote_callback,
-				   req);
-	LDB_REQ_SET_LOCATION(ac->remote_req);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* No local db, just run the remote request */
-	if (!map_check_local_db(ac->module)) {
-		/* Do the remote request. */
-		return ldb_next_remote_request(ac->module, ac->remote_req);
-	}
-
-	/* Prepare the search operation */
-	ret = map_search_self_req(&search_req, ac, req->op.del.dn);
-	if (ret != LDB_SUCCESS) {
-		map_oom(module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return ldb_next_request(module, search_req);
-}
-
-/* Delete the local record. */
-static int map_delete_do_local(struct map_context *ac)
-{
-	struct ldb_request *local_req;
-	struct ldb_context *ldb;
-	int ret;
-
-	ldb = ldb_module_get_ctx(ac->module);
-
-	/* No local record, continue remotely */
-	if (ac->local_dn == NULL) {
-		/* Do the remote request. */
-		return ldb_next_remote_request(ac->module, ac->remote_req);
-	}
-
-	/* Prepare the local operation */
-	ret = ldb_build_del_req(&local_req, ldb, ac,
-				   ac->req->op.del.dn,
-				   ac->req->controls,
-				   ac,
-				   map_op_local_callback,
-				   ac->req);
-	LDB_REQ_SET_LOCATION(local_req);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	return ldb_next_request(ac->module, local_req);
-}
-
-/*****************************************************************************
- * RENAME operations
-*****************************************************************************/
-
-/* Rename a record. */
-int ldb_map_rename(struct ldb_module *module, struct ldb_request *req)
-{
-	struct ldb_request *search_req;
-	struct ldb_context *ldb;
-	struct map_context *ac;
-	int ret;
-
-	ldb = ldb_module_get_ctx(module);
-
-	/* Do not manipulate our control entries */
-	if (ldb_dn_is_special(req->op.rename.olddn)) {
-		return ldb_next_request(module, req);
-	}
-
-	/* No mapping requested (perhaps no DN mapping specified).
-	 * Skip to next module */
-	if ((!ldb_dn_check_local(module, req->op.rename.olddn)) &&
-	    (!ldb_dn_check_local(module, req->op.rename.newdn))) {
-		return ldb_next_request(module, req);
-	}
-
-	/* Rename into/out of the mapped partition requested, bail out */
-	if (!ldb_dn_check_local(module, req->op.rename.olddn) ||
-	    !ldb_dn_check_local(module, req->op.rename.newdn)) {
-		return LDB_ERR_AFFECTS_MULTIPLE_DSAS;
-	}
-
-	/* Prepare context and handle */
-	ac = map_init_context(module, req);
-	if (ac == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* Prepare the remote operation */
-	ret = ldb_build_rename_req(&ac->remote_req, ldb, ac,
-				   ldb_dn_map_local(module, ac, req->op.rename.olddn),
-				   ldb_dn_map_local(module, ac, req->op.rename.newdn),
-				   req->controls,
-				   ac, map_op_remote_callback,
-				   req);
-	LDB_REQ_SET_LOCATION(ac->remote_req);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* No local db, just run the remote request */
-	if (!map_check_local_db(ac->module)) {
-		/* Do the remote request. */
-		return ldb_next_remote_request(ac->module, ac->remote_req);
-	}
-
-	/* Prepare the search operation */
-	ret = map_search_self_req(&search_req, ac, req->op.rename.olddn);
-	if (ret != LDB_SUCCESS) {
-		map_oom(module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return ldb_next_request(module, search_req);
-}
-
-/* Rename the local record. */
-static int map_rename_do_local(struct map_context *ac)
-{
-	struct ldb_request *local_req;
-	struct ldb_context *ldb;
-	int ret;
-
-	ldb = ldb_module_get_ctx(ac->module);
-
-	/* No local record, continue remotely */
-	if (ac->local_dn == NULL) {
-		/* Do the remote request. */
-		return ldb_next_remote_request(ac->module, ac->remote_req);
-	}
-
-	/* Prepare the local operation */
-	ret = ldb_build_rename_req(&local_req, ldb, ac,
-				   ac->req->op.rename.olddn,
-				   ac->req->op.rename.newdn,
-				   ac->req->controls,
-				   ac,
-				   map_rename_local_callback,
-				   ac->req);
-	LDB_REQ_SET_LOCATION(local_req);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return ldb_next_request(ac->module, local_req);
-}
-
-static int map_rename_local_callback(struct ldb_request *req,
-				     struct ldb_reply *ares)
-{
-	struct ldb_context *ldb;
-	struct map_context *ac;
-	int ret;
-
-	ac = talloc_get_type(req->context, struct map_context);
-	ldb = ldb_module_get_ctx(ac->module);
-
-	if (!ares) {
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-	if (ares->error != LDB_SUCCESS) {
-		return ldb_module_done(ac->req, ares->controls,
-					ares->response, ares->error);
-	}
-
-	if (ares->type != LDB_REPLY_DONE) {
-		ldb_set_errstring(ldb, "Invalid reply type!");
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-
-	/* proceed with next step */
-	ret = map_rename_do_fixup(ac);
-	if (ret != LDB_SUCCESS) {
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-
-	return LDB_SUCCESS;
-}
-
-/* Update the local 'IS_MAPPED' attribute. */
-static int map_rename_do_fixup(struct map_context *ac)
-{
-	struct ldb_request *local_req;
-
-	/* Prepare the fixup operation */
-	/* TODO: use GUIDs here instead -- or skip it when GUIDs are used. */
-	local_req = map_build_fixup_req(ac,
-					ac->req->op.rename.newdn,
-					ac->remote_req->op.rename.newdn,
-					ac,
-					map_op_local_callback);
-	if (local_req == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return ldb_next_request(ac->module, local_req);
-}
diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
deleted file mode 100644
index 2c517a625d..0000000000
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ /dev/null
@@ -1,1407 +0,0 @@
-/*
-   ldb database mapping module
-
-   Copyright (C) Jelmer Vernooij 2005
-   Copyright (C) Martin Kuehl <mkhl@samba.org> 2006
-   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2006
-   Copyright (C) Simo Sorce <idra@samba.org> 2008
-
-     ** NOTE! The following LGPL license applies to the ldb
-     ** library. This does NOT imply that all of Samba is released
-     ** under the LGPL
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   This library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "replace.h"
-#include "system/filesys.h"
-#include "system/time.h"
-#include "ldb_map.h"
-#include "ldb_map_private.h"
-
-
-/* Mapping attributes
- * ================== */
-
-/* Select attributes that stay in the local partition. */
-static const char **map_attrs_select_local(struct ldb_module *module, void *mem_ctx, const char * const *attrs)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	const char **result;
-	unsigned int i, last;
-
-	if (attrs == NULL)
-		return NULL;
-
-	last = 0;
-	result = talloc_array(mem_ctx, const char *, 1);
-	if (result == NULL) {
-		goto failed;
-	}
-	result[0] = NULL;
-
-	for (i = 0; attrs[i]; i++) {
-		/* Wildcards and ignored attributes are kept locally */
-		if ((ldb_attr_cmp(attrs[i], "*") == 0) ||
-		    (!map_attr_check_remote(data, attrs[i]))) {
-			result = talloc_realloc(mem_ctx, result, const char *, last+2);
-			if (result == NULL) {
-				goto failed;
-			}
-
-			result[last] = talloc_strdup(result, attrs[i]);
-			result[last+1] = NULL;
-			last++;
-		}
-	}
-
-	return result;
-
-failed:
-	talloc_free(result);
-	map_oom(module);
-	return NULL;
-}
-
-/* Collect attributes that are mapped into the remote partition. */
-static const char **map_attrs_collect_remote(struct ldb_module *module, void *mem_ctx, 
-					     const char * const *attrs)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	const char **result;
-	const struct ldb_map_attribute *map;
-	const char *name=NULL;
-	unsigned int i, j, last;
-	int ret;
-
-	last = 0;
-	result = talloc_array(mem_ctx, const char *, 1);
-	if (result == NULL) {
-		goto failed;
-	}
-	result[0] = NULL;
-
-	for (i = 0; attrs[i]; i++) {
-		/* Wildcards are kept remotely, too */
-		if (ldb_attr_cmp(attrs[i], "*") == 0) {
-			const char **new_attrs = NULL;
-			ret = map_attrs_merge(module, mem_ctx, &new_attrs, attrs);
-			if (ret != LDB_SUCCESS) {
-				goto failed;
-			}
-			ret = map_attrs_merge(module, mem_ctx, &new_attrs, data->wildcard_attributes);
-			if (ret != LDB_SUCCESS) {
-				goto failed;
-			}
-
-			attrs = new_attrs;
-			break;
-		}
-	}
-
-	for (i = 0; attrs[i]; i++) {
-		/* Wildcards are kept remotely, too */
-		if (ldb_attr_cmp(attrs[i], "*") == 0) {
-			/* Add all 'include in wildcard' attributes */
-			name = attrs[i];
-			goto named;
-		}
-
-		/* Add remote names of mapped attrs */
-		map = map_attr_find_local(data, attrs[i]);
-		if (map == NULL) {
-			continue;
-		}
-
-		switch (map->type) {
-		case LDB_MAP_IGNORE:
-			continue;
-
-		case LDB_MAP_KEEP:
-			name = attrs[i];
-			goto named;
-
-		case LDB_MAP_RENAME:
-		case LDB_MAP_CONVERT:
-			name = map->u.rename.remote_name;
-			goto named;
-
-		case LDB_MAP_GENERATE:
-			/* Add all remote names of "generate" attrs */
-			for (j = 0; map->u.generate.remote_names[j]; j++) {
-				result = talloc_realloc(mem_ctx, result, const char *, last+2);
-				if (result == NULL) {
-					goto failed;
-				}
-
-				result[last] = talloc_strdup(result, map->u.generate.remote_names[j]);
-				result[last+1] = NULL;
-				last++;
-			}
-			continue;
-		}
-
-	named:	/* We found a single remote name, add that */
-		result = talloc_realloc(mem_ctx, result, const char *, last+2);
-		if (result == NULL) {
-			goto failed;
-		}
-
-		result[last] = talloc_strdup(result, name);
-		result[last+1] = NULL;
-		last++;
-	}
-
-	return result;
-
-failed:
-	talloc_free(result);
-	map_oom(module);
-	return NULL;
-}
-
-/* Split attributes that stay in the local partition from those that
- * are mapped into the remote partition. */
-static int map_attrs_partition(struct ldb_module *module, void *mem_ctx, const char ***local_attrs, const char ***remote_attrs, const char * const *attrs)
-{
-	*local_attrs = map_attrs_select_local(module, mem_ctx, attrs);
-	*remote_attrs = map_attrs_collect_remote(module, mem_ctx, attrs);
-
-	return 0;
-}
-
-/* Mapping message elements
- * ======================== */
-
-/* Add an element to a message, overwriting any old identically named elements. */
-static int ldb_msg_replace(struct ldb_message *msg, const struct ldb_message_element *el)
-{
-	struct ldb_message_element *old;
-
-	old = ldb_msg_find_element(msg, el->name);
-
-	/* no local result, add as new element */
-	if (old == NULL) {
-		if (ldb_msg_add_empty(msg, el->name, 0, &old) != 0) {
-			return -1;
-		}
-		talloc_free(discard_const_p(char, old->name));
-	}
-
-	/* copy new element */
-	*old = *el;
-
-	/* and make sure we reference the contents */
-	if (!talloc_reference(msg->elements, el->name)) {
-		return -1;
-	}
-	if (!talloc_reference(msg->elements, el->values)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Map a message element back into the local partition. */
-static struct ldb_message_element *ldb_msg_el_map_remote(struct ldb_module *module, 
-							 void *mem_ctx, 
-							 const struct ldb_map_attribute *map, 
-							 const char *attr_name,
-							 const struct ldb_message_element *old)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	const char *local_attr_name = attr_name;
-	struct ldb_message_element *el;
-	unsigned int i;
-
-	el = talloc_zero(mem_ctx, struct ldb_message_element);
-	if (el == NULL) {
-		map_oom(module);
-		return NULL;
-	}
-
-	el->values = talloc_array(el, struct ldb_val, old->num_values);
-	if (el->values == NULL) {
-		talloc_free(el);
-		map_oom(module);
-		return NULL;
-	}
-
-	for (i = 0; data->attribute_maps[i].local_name; i++) {
-		struct ldb_map_attribute *am = &data->attribute_maps[i];
-		if ((am->type == LDB_MAP_RENAME &&
-			!strcmp(am->u.rename.remote_name, attr_name))
-		    || (am->type == LDB_MAP_CONVERT &&
-			!strcmp(am->u.convert.remote_name, attr_name))) {
-
-			local_attr_name = am->local_name;
-			break;
-		}
-	}
-
-	el->name = talloc_strdup(el, local_attr_name);
-	if (el->name == NULL) {
-		talloc_free(el);
-		map_oom(module);
-		return NULL;
-	}
-
-	for (i = 0; i < old->num_values; i++) {
-		el->values[i] = ldb_val_map_remote(module, el->values, map, &old->values[i]);
-		/* Conversions might fail, in which case bail */
-		if (!el->values[i].data) {
-			talloc_free(el);
-			return NULL;
-		}
-		el->num_values++;
-	}
-
-	return el;
-}
-
-/* Merge a remote message element into a local message. */
-static int ldb_msg_el_merge(struct ldb_module *module, struct ldb_message *local, 
-			    struct ldb_message *remote, const char *attr_name)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	const struct ldb_map_attribute *map;
-	struct ldb_message_element *old, *el=NULL;
-	const char *remote_name = NULL;
-	struct ldb_context *ldb;
-
-	ldb = ldb_module_get_ctx(module);
-
-	/* We handle wildcards in ldb_msg_el_merge_wildcard */
-	if (ldb_attr_cmp(attr_name, "*") == 0) {
-		return LDB_SUCCESS;
-	}
-
-	map = map_attr_find_local(data, attr_name);
-
-	/* Unknown attribute in remote message:
-	 * skip, attribute was probably auto-generated */
-	if (map == NULL) {
-		return LDB_SUCCESS;
-	}
-
-	switch (map->type) {
-	case LDB_MAP_IGNORE:
-		break;
-	case LDB_MAP_CONVERT:
-		remote_name = map->u.convert.remote_name;
-		break;
-	case LDB_MAP_KEEP:
-		remote_name = attr_name;
-		break;
-	case LDB_MAP_RENAME:
-		remote_name = map->u.rename.remote_name;
-		break;
-	case LDB_MAP_GENERATE:
-		break;
-	}
-
-	switch (map->type) {
-	case LDB_MAP_IGNORE:
-		return LDB_SUCCESS;
-
-	case LDB_MAP_CONVERT:
-		if (map->u.convert.convert_remote == NULL) {
-			ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-				  "Skipping attribute '%s': "
-				  "'convert_remote' not set",
-				  attr_name);
-			return LDB_SUCCESS;
-		}
-		/* fall through */
-	case LDB_MAP_KEEP:
-	case LDB_MAP_RENAME:
-		old = ldb_msg_find_element(remote, remote_name);
-		if (old) {
-			el = ldb_msg_el_map_remote(module, local, map, attr_name, old);
-		} else {
-			return LDB_ERR_NO_SUCH_ATTRIBUTE;
-		}
-		break;
-
-	case LDB_MAP_GENERATE:
-		if (map->u.generate.generate_local == NULL) {
-			ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_map: "
-				  "Skipping attribute '%s': "
-				  "'generate_local' not set",
-				  attr_name);
-			return LDB_SUCCESS;
-		}
-
-		el = map->u.generate.generate_local(module, local, attr_name, remote);
-		if (!el) {
-			/* Generation failure is probably due to lack of source attributes */
-			return LDB_ERR_NO_SUCH_ATTRIBUTE;
-		}
-		break;
-	}
-
-	if (el == NULL) {
-		return LDB_ERR_NO_SUCH_ATTRIBUTE;
-	}
-
-	return ldb_msg_replace(local, el);
-}
-
-/* Handle wildcard parts of merging a remote message element into a local message. */
-static int ldb_msg_el_merge_wildcard(struct ldb_module *module, struct ldb_message *local, 
-				     struct ldb_message *remote)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	const struct ldb_map_attribute *map = map_attr_find_local(data, "*");
-	struct ldb_message_element *el=NULL;
-	unsigned int i;
-	int ret;
-
-	/* Perhaps we have a mapping for "*" */
-	if (map && map->type == LDB_MAP_KEEP) {
-		/* We copy everything over, and hope that anything with a 
-		   more specific rule is overwritten */
-		for (i = 0; i < remote->num_elements; i++) {
-			el = ldb_msg_el_map_remote(module, local, map, remote->elements[i].name,
-						   &remote->elements[i]);
-			if (el == NULL) {
-				return LDB_ERR_OPERATIONS_ERROR;
-			}
-			
-			ret = ldb_msg_replace(local, el);
-			if (ret) {
-				return ret;
-			}
-		}
-	}
-	
-	/* Now walk the list of possible mappings, and apply each */
-	for (i = 0; data->attribute_maps[i].local_name; i++) {
-		ret = ldb_msg_el_merge(module, local, remote, 
-				       data->attribute_maps[i].local_name);
-		if (ret == LDB_ERR_NO_SUCH_ATTRIBUTE) {
-			continue;
-		} else if (ret) {
-			return ret;
-		} else {
-			continue;
-		}
-	}
-
-	return LDB_SUCCESS;
-}
-
-/* Mapping messages
- * ================ */
-
-/* Merge two local messages into a single one. */
-static int ldb_msg_merge_local(struct ldb_module *module, struct ldb_message *msg1, struct ldb_message *msg2)
-{
-	unsigned int i;
-	int ret;
-
-	for (i = 0; i < msg2->num_elements; i++) {
-		ret = ldb_msg_replace(msg1, &msg2->elements[i]);
-		if (ret) {
-			return ret;
-		}
-	}
-
-	return LDB_SUCCESS;
-}
-
-/* Merge a local and a remote message into a single local one. */
-static int ldb_msg_merge_remote(struct map_context *ac, struct ldb_message *local, 
-				struct ldb_message *remote)
-{
-	unsigned int i;
-	int ret;
-	const char * const *attrs = ac->all_attrs;
-	if (!attrs) {
-		ret = ldb_msg_el_merge_wildcard(ac->module, local, remote);
-		if (ret) {
-			return ret;
-		}
-	}
-
-	for (i = 0; attrs && attrs[i]; i++) {
-		if (ldb_attr_cmp(attrs[i], "*") == 0) {
-			ret = ldb_msg_el_merge_wildcard(ac->module, local, remote);
-			if (ret) {
-				return ret;
-			}
-			break;
-		}
-	}
-
-	/* Try to map each attribute back;
-	 * Add to local message is possible,
-	 * Overwrite old local attribute if necessary */
-	for (i = 0; attrs && attrs[i]; i++) {
-		ret = ldb_msg_el_merge(ac->module, local, remote, 
-				       attrs[i]);
-		if (ret == LDB_ERR_NO_SUCH_ATTRIBUTE) {
-		} else if (ret) {
-			return ret;
-		}
-	}
-
-	return LDB_SUCCESS;
-}
-
-/* Mapping search results
- * ====================== */
-
-/* Map a search result back into the local partition. */
-static int map_reply_remote(struct map_context *ac, struct ldb_reply *ares)
-{
-	struct ldb_message *msg;
-	struct ldb_dn *dn;
-	int ret;
-
-	/* There is no result message, skip */
-	if (ares->type != LDB_REPLY_ENTRY) {
-		return 0;
-	}
-
-	/* Create a new result message */
-	msg = ldb_msg_new(ares);
-	if (msg == NULL) {
-		map_oom(ac->module);
-		return -1;
-	}
-
-	/* Merge remote message into new message */
-	ret = ldb_msg_merge_remote(ac, msg, ares->message);
-	if (ret) {
-		talloc_free(msg);
-		return ret;
-	}
-
-	/* Create corresponding local DN */
-	dn = ldb_dn_map_rebase_remote(ac->module, msg, ares->message->dn);
-	if (dn == NULL) {
-		talloc_free(msg);
-		return -1;
-	}
-	msg->dn = dn;
-
-	/* Store new message with new DN as the result */
-	talloc_free(ares->message);
-	ares->message = msg;
-
-	return 0;
-}
-
-/* Mapping parse trees
- * =================== */
-
-/* Check whether a parse tree can safely be split in two. */
-static bool ldb_parse_tree_check_splittable(const struct ldb_parse_tree *tree)
-{
-	const struct ldb_parse_tree *subtree = tree;
-	bool negate = false;
-
-	while (subtree) {
-		switch (subtree->operation) {
-		case LDB_OP_NOT:
-			negate = !negate;
-			subtree = subtree->u.isnot.child;
-			continue;
-
-		case LDB_OP_AND:
-			return !negate;	/* if negate: False */
-
-		case LDB_OP_OR:
-			return negate;	/* if negate: True */
-
-		default:
-			return true;	/* simple parse tree */
-		}
-	}
-
-	return true;			/* no parse tree */
-}
-
-/* Collect a list of attributes required to match a given parse tree. */
-static int ldb_parse_tree_collect_attrs(struct ldb_module *module, void *mem_ctx, const char ***attrs, const struct ldb_parse_tree *tree)
-{
-	const char **new_attrs;
-	unsigned int i;
-	int ret;
-
-	if (tree == NULL) {
-		return 0;
-	}
-
-	switch (tree->operation) {
-	case LDB_OP_OR:
-	case LDB_OP_AND:		/* attributes stored in list of subtrees */
-		for (i = 0; i < tree->u.list.num_elements; i++) {
-			ret = ldb_parse_tree_collect_attrs(module, mem_ctx, 
-							   attrs, tree->u.list.elements[i]);
-			if (ret) {
-				return ret;
-			}
-		}
-		return 0;
-
-	case LDB_OP_NOT:		/* attributes stored in single subtree */
-		return ldb_parse_tree_collect_attrs(module, mem_ctx, attrs, tree->u.isnot.child);
-
-	default:			/* single attribute in tree */
-		new_attrs = ldb_attr_list_copy_add(mem_ctx, *attrs, tree->u.equality.attr);
-		talloc_free(*attrs);
-		*attrs = new_attrs;
-		return 0;
-	}
-}
-
-static int map_subtree_select_local(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree);
-
-/* Select a negated subtree that queries attributes in the local partition */
-static int map_subtree_select_local_not(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree)
-{
-	struct ldb_parse_tree *child;
-	int ret;
-
-	/* Prepare new tree */
-	*new = talloc_memdup(mem_ctx, tree, sizeof(struct ldb_parse_tree));
-	if (*new == NULL) {
-		map_oom(module);
-		return -1;
-	}
-
-	/* Generate new subtree */
-	ret = map_subtree_select_local(module, *new, &child, tree->u.isnot.child);
-	if (ret) {
-		talloc_free(*new);
-		return ret;
-	}
-
-	/* Prune tree without subtree */
-	if (child == NULL) {
-		talloc_free(*new);
-		*new = NULL;
-		return 0;
-	}
-
-	(*new)->u.isnot.child = child;
-
-	return ret;
-}
-
-/* Select a list of subtrees that query attributes in the local partition */
-static int map_subtree_select_local_list(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree)
-{
-	unsigned int i, j;
-	int ret=0;
-
-	/* Prepare new tree */
-	*new = talloc_memdup(mem_ctx, tree, sizeof(struct ldb_parse_tree));
-	if (*new == NULL) {
-		map_oom(module);
-		return -1;
-	}
-
-	/* Prepare list of subtrees */
-	(*new)->u.list.num_elements = 0;
-	(*new)->u.list.elements = talloc_array(*new, struct ldb_parse_tree *, tree->u.list.num_elements);
-	if ((*new)->u.list.elements == NULL) {
-		map_oom(module);
-		talloc_free(*new);
-		return -1;
-	}
-
-	/* Generate new list of subtrees */
-	j = 0;
-	for (i = 0; i < tree->u.list.num_elements; i++) {
-		struct ldb_parse_tree *child;
-		ret = map_subtree_select_local(module, *new, &child, tree->u.list.elements[i]);
-		if (ret) {
-			talloc_free(*new);
-			return ret;
-		}
-
-		if (child) {
-			(*new)->u.list.elements[j] = child;
-			j++;
-		}
-	}
-
-	/* Prune tree without subtrees */
-	if (j == 0) {
-		talloc_free(*new);
-		*new = NULL;
-		return 0;
-	}
-
-	/* Fix subtree list size */
-	(*new)->u.list.num_elements = j;
-	(*new)->u.list.elements = talloc_realloc(*new, (*new)->u.list.elements, struct ldb_parse_tree *, (*new)->u.list.num_elements);
-
-	return ret;
-}
-
-/* Select a simple subtree that queries attributes in the local partition */
-static int map_subtree_select_local_simple(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree)
-{
-	/* Prepare new tree */
-	*new = talloc_memdup(mem_ctx, tree, sizeof(struct ldb_parse_tree));
-	if (*new == NULL) {
-		map_oom(module);
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Select subtrees that query attributes in the local partition */
-static int map_subtree_select_local(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-
-	if (tree == NULL) {
-		return 0;
-	}
-
-	if (tree->operation == LDB_OP_NOT) {
-		return map_subtree_select_local_not(module, mem_ctx, new, tree);
-	}
-
-	if (tree->operation == LDB_OP_AND || tree->operation == LDB_OP_OR) {
-		return map_subtree_select_local_list(module, mem_ctx, new, tree);
-	}
-
-	if (map_attr_check_remote(data, tree->u.equality.attr)) {
-		*new = NULL;
-		return 0;
-	}
-
-	return map_subtree_select_local_simple(module, mem_ctx, new, tree);
-}
-
-static int map_subtree_collect_remote(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree);
-
-/* Collect a negated subtree that queries attributes in the remote partition */
-static int map_subtree_collect_remote_not(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree)
-{
-	struct ldb_parse_tree *child;
-	int ret;
-
-	/* Prepare new tree */
-	*new = talloc_memdup(mem_ctx, tree, sizeof(struct ldb_parse_tree));
-	if (*new == NULL) {
-		map_oom(module);
-		return -1;
-	}
-
-	/* Generate new subtree */
-	ret = map_subtree_collect_remote(module, *new, &child, tree->u.isnot.child);
-	if (ret) {
-		talloc_free(*new);
-		return ret;
-	}
-
-	/* Prune tree without subtree */
-	if (child == NULL) {
-		talloc_free(*new);
-		*new = NULL;
-		return 0;
-	}
-
-	(*new)->u.isnot.child = child;
-
-	return ret;
-}
-
-/* Collect a list of subtrees that query attributes in the remote partition */
-static int map_subtree_collect_remote_list(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree)
-{
-	unsigned int i, j;
-	int ret=0;
-
-	/* Prepare new tree */
-	*new = talloc_memdup(mem_ctx, tree, sizeof(struct ldb_parse_tree));
-	if (*new == NULL) {
-		map_oom(module);
-		return -1;
-	}
-
-	/* Prepare list of subtrees */
-	(*new)->u.list.num_elements = 0;
-	(*new)->u.list.elements = talloc_array(*new, struct ldb_parse_tree *, tree->u.list.num_elements);
-	if ((*new)->u.list.elements == NULL) {
-		map_oom(module);
-		talloc_free(*new);
-		return -1;
-	}
-
-	/* Generate new list of subtrees */
-	j = 0;
-	for (i = 0; i < tree->u.list.num_elements; i++) {
-		struct ldb_parse_tree *child;
-		ret = map_subtree_collect_remote(module, *new, &child, tree->u.list.elements[i]);
-		if (ret) {
-			talloc_free(*new);
-			return ret;
-		}
-
-		if (child) {
-			(*new)->u.list.elements[j] = child;
-			j++;
-		}
-	}
-
-	/* Prune tree without subtrees */
-	if (j == 0) {
-		talloc_free(*new);
-		*new = NULL;
-		return 0;
-	}
-
-	/* Fix subtree list size */
-	(*new)->u.list.num_elements = j;
-	(*new)->u.list.elements = talloc_realloc(*new, (*new)->u.list.elements, struct ldb_parse_tree *, (*new)->u.list.num_elements);
-
-	return ret;
-}
-
-/* Collect a simple subtree that queries attributes in the remote partition */
-int map_subtree_collect_remote_simple(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree, const struct ldb_map_attribute *map)
-{
-	const char *attr;
-
-	/* Prepare new tree */
-	*new = talloc(mem_ctx, struct ldb_parse_tree);
-	if (*new == NULL) {
-		map_oom(module);
-		return -1;
-	}
-	**new = *tree;
-	
-	if (map->type == LDB_MAP_KEEP) {
-		/* Nothing to do here */
-		return 0;
-	}
-
-	/* Store attribute and value in new tree */
-	switch (tree->operation) {
-	case LDB_OP_PRESENT:
-		attr = map_attr_map_local(*new, map, tree->u.present.attr);
-		(*new)->u.present.attr = attr;
-		break;
-	case LDB_OP_SUBSTRING:
-	{
-		attr = map_attr_map_local(*new, map, tree->u.substring.attr);
-		(*new)->u.substring.attr = attr;
-		break;
-	}
-	case LDB_OP_EQUALITY:
-		attr = map_attr_map_local(*new, map, tree->u.equality.attr);
-		(*new)->u.equality.attr = attr;
-		break;
-	case LDB_OP_LESS:
-	case LDB_OP_GREATER:
-	case LDB_OP_APPROX:
-		attr = map_attr_map_local(*new, map, tree->u.comparison.attr);
-		(*new)->u.comparison.attr = attr;
-		break;
-	case LDB_OP_EXTENDED:
-		attr = map_attr_map_local(*new, map, tree->u.extended.attr);
-		(*new)->u.extended.attr = attr;
-		break;
-	default:			/* unknown kind of simple subtree */
-		talloc_free(*new);
-		return -1;
-	}
-
-	if (attr == NULL) {
-		talloc_free(*new);
-		*new = NULL;
-		return 0;
-	}
-
-	if (map->type == LDB_MAP_RENAME) {
-		/* Nothing more to do here, the attribute has been renamed */
-		return 0;
-	}
-
-	/* Store attribute and value in new tree */
-	switch (tree->operation) {
-	case LDB_OP_PRESENT:
-		break;
-	case LDB_OP_SUBSTRING:
-	{
-		int i;
-		/* Map value */
-		(*new)->u.substring.chunks = NULL;
-		for (i=0; tree->u.substring.chunks[i]; i++) {
-			(*new)->u.substring.chunks = talloc_realloc(*new, (*new)->u.substring.chunks, struct ldb_val *, i+2);
-			if (!(*new)->u.substring.chunks) {
-				talloc_free(*new);
-				*new = NULL;
-				return 0;
-			}
-			(*new)->u.substring.chunks[i] = talloc(*new, struct ldb_val);
-			if (!(*new)->u.substring.chunks[i]) {
-				talloc_free(*new);
-				*new = NULL;
-				return 0;
-			}
-			*(*new)->u.substring.chunks[i] = ldb_val_map_local(module, *new, map, tree->u.substring.chunks[i]);
-			(*new)->u.substring.chunks[i+1] = NULL;
-		}
-		break;
-	}
-	case LDB_OP_EQUALITY:
-		(*new)->u.equality.value = ldb_val_map_local(module, *new, map, &tree->u.equality.value);
-		break;
-	case LDB_OP_LESS:
-	case LDB_OP_GREATER:
-	case LDB_OP_APPROX:
-		(*new)->u.comparison.value = ldb_val_map_local(module, *new, map, &tree->u.comparison.value);
-		break;
-	case LDB_OP_EXTENDED:
-		(*new)->u.extended.value = ldb_val_map_local(module, *new, map, &tree->u.extended.value);
-		(*new)->u.extended.rule_id = talloc_strdup(*new, tree->u.extended.rule_id);
-		break;
-	default:			/* unknown kind of simple subtree */
-		talloc_free(*new);
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Collect subtrees that query attributes in the remote partition */
-static int map_subtree_collect_remote(struct ldb_module *module, void *mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree)
-{
-	const struct ldb_map_context *data = map_get_context(module);
-	const struct ldb_map_attribute *map;
-	struct ldb_context *ldb;
-
-	ldb = ldb_module_get_ctx(module);
-
-	if (tree == NULL) {
-		return 0;
-	}
-
-	if (tree->operation == LDB_OP_NOT) {
-		return map_subtree_collect_remote_not(module, mem_ctx, new, tree);
-	}
-
-	if ((tree->operation == LDB_OP_AND) || (tree->operation == LDB_OP_OR)) {
-		return map_subtree_collect_remote_list(module, mem_ctx, new, tree);
-	}
-
-	if (!map_attr_check_remote(data, tree->u.equality.attr)) {
-		*new = NULL;
-		return 0;
-	}
-
-	map = map_attr_find_local(data, tree->u.equality.attr);
-	if (map->convert_operator) {
-		return map->convert_operator(module, mem_ctx, new, tree);
-	}
-
-	if (map->type == LDB_MAP_GENERATE) {
-		ldb_debug(ldb, LDB_DEBUG_WARNING, "ldb_map: "
-			  "Skipping attribute '%s': "
-			  "'convert_operator' not set",
-			  tree->u.equality.attr);
-		*new = NULL;
-		return 0;
-	}
-
-	return map_subtree_collect_remote_simple(module, mem_ctx, new, tree, map);
-}
-
-/* Split subtrees that query attributes in the local partition from
- * those that query the remote partition. */
-static int ldb_parse_tree_partition(struct ldb_module *module,
-					void *mem_ctx,
-					struct ldb_parse_tree **local_tree,
-					struct ldb_parse_tree **remote_tree,
-					const struct ldb_parse_tree *tree)
-{
-	int ret;
-
-	*local_tree = NULL;
-	*remote_tree = NULL;
-
-	/* No original tree */
-	if (tree == NULL) {
-		return 0;
-	}
-
-	/* Generate local tree */
-	ret = map_subtree_select_local(module, mem_ctx, local_tree, tree);
-	if (ret) {
-		return ret;
-	}
-
-	/* Generate remote tree */
-	ret = map_subtree_collect_remote(module, mem_ctx, remote_tree, tree);
-	if (ret) {
-		talloc_free(*local_tree);
-		return ret;
-	}
-
-	return 0;
-}
-
-/* Collect a list of attributes required either explicitly from a
- * given list or implicitly  from a given parse tree; split the
- * collected list into local and remote parts. */
-static int map_attrs_collect_and_partition(struct ldb_module *module, struct map_context *ac,
-					   const char * const *search_attrs, 
-					   const struct ldb_parse_tree *tree)
-{
-	void *tmp_ctx;
-	const char **tree_attrs;
-	const char **remote_attrs;
-	const char **local_attrs;
-	int ret;
-
-	/* There is no tree, just partition the searched attributes */
-	if (tree == NULL) {
-		ret = map_attrs_partition(module, ac, 
-					  &local_attrs, &remote_attrs, search_attrs);
-		if (ret == 0) {
-			ac->local_attrs = local_attrs;
-			ac->remote_attrs = remote_attrs;
-			ac->all_attrs = search_attrs;
-		}
-		return ret; 
-	}
-
-	/* Create context for temporary memory */
-	tmp_ctx = talloc_new(ac);
-	if (tmp_ctx == NULL) {
-		goto oom;
-	}
-
-	/* Prepare list of attributes from tree */
-	tree_attrs = talloc_array(tmp_ctx, const char *, 1);
-	if (tree_attrs == NULL) {
-		talloc_free(tmp_ctx);
-		goto oom;
-	}
-	tree_attrs[0] = NULL;
-
-	/* Collect attributes from tree */
-	ret = ldb_parse_tree_collect_attrs(module, tmp_ctx, &tree_attrs, tree);
-	if (ret) {
-		goto done;
-	}
-
-	/* Merge attributes from search operation */
-	ret = map_attrs_merge(module, tmp_ctx, &tree_attrs, search_attrs);
-	if (ret) {
-		goto done;
-	}
-
-	/* Split local from remote attributes */
-	ret = map_attrs_partition(module, ac, &local_attrs, 
-				  &remote_attrs, tree_attrs);
-	
-	if (ret == 0) {
-		ac->local_attrs = local_attrs;
-		ac->remote_attrs = remote_attrs;
-		talloc_steal(ac, tree_attrs);
-		ac->all_attrs = tree_attrs;
-	}
-done:
-	/* Free temporary memory */
-	talloc_free(tmp_ctx);
-	return ret;
-
-oom:
-	map_oom(module);
-	return -1;
-}
-
-
-/* Outbound requests: search
- * ========================= */
-
-static int map_remote_search_callback(struct ldb_request *req,
-					struct ldb_reply *ares);
-static int map_local_merge_callback(struct ldb_request *req,
-					struct ldb_reply *ares);
-static int map_search_local(struct map_context *ac);
-
-static int map_save_entry(struct map_context *ac, struct ldb_reply *ares)
-{
-	struct map_reply *mr;
-
-	mr = talloc_zero(ac, struct map_reply);
-	if (mr == NULL) {
-		map_oom(ac->module);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	mr->remote = talloc_steal(mr, ares);
-	if (ac->r_current) {
-		ac->r_current->next = mr;
-	} else {
-		/* first entry */
-		ac->r_list = mr;
-	}
-	ac->r_current = mr;
-
-	return LDB_SUCCESS;
-}
-
-/* Pass a merged search result up the callback chain. */
-int map_return_entry(struct map_context *ac, struct ldb_reply *ares)
-{
-	struct ldb_message_element *el;
-	const char * const *attrs;
-	struct ldb_context *ldb;
-	unsigned int i;
-	int ret;
-	bool matched;
-
-	ldb = ldb_module_get_ctx(ac->module);
-
-	/* Merged result doesn't match original query, skip */
-	ret = ldb_match_msg_error(ldb, ares->message,
-				  ac->req->op.search.tree,
-				  ac->req->op.search.base,
-				  ac->req->op.search.scope,
-				  &matched);
-	if (ret != LDB_SUCCESS) return ret;
-	if (!matched) {
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_map: "
-			  "Skipping record '%s': "
-			  "doesn't match original search",
-			  ldb_dn_get_linearized(ares->message->dn));
-		return LDB_SUCCESS;
-	}
-
-	/* Limit result to requested attrs */
-	if (ac->req->op.search.attrs &&
-	    (! ldb_attr_in_list(ac->req->op.search.attrs, "*"))) {
-
-		attrs = ac->req->op.search.attrs;
-		i = 0;
-
-		while (i < ares->message->num_elements) {
-
-			el = &ares->message->elements[i];
-			if ( ! ldb_attr_in_list(attrs, el->name)) {
-				ldb_msg_remove_element(ares->message, el);
-			} else {
-				i++;
-			}
-		}
-	}
-
-	return ldb_module_send_entry(ac->req, ares->message, ares->controls);
-}
-
-/* Search a record. */
-int ldb_map_search(struct ldb_module *module, struct ldb_request *req)
-{
-	struct ldb_parse_tree *remote_tree;
-	struct ldb_parse_tree *local_tree;
-	struct ldb_request *remote_req;
-	struct ldb_context *ldb;
-	struct map_context *ac;
-	int ret;
-
-	const char *wildcard[] = { "*", NULL };
-	const char * const *attrs;
-
-	ldb = ldb_module_get_ctx(module);
-
-	/* if we're not yet initialized, go to the next module */
-	if (!ldb_module_get_private(module))
-		return ldb_next_request(module, req);
-
-	/* Do not manipulate our control entries */
-	if (ldb_dn_is_special(req->op.search.base)) {
-		return ldb_next_request(module, req);
-	}
-
-	/* No mapping requested, skip to next module */
-	if ((req->op.search.base) && (!ldb_dn_check_local(module, req->op.search.base))) {
-		return ldb_next_request(module, req);
-	}
-
-	/* TODO: How can we be sure about which partition we are
-	 *	 targetting when there is no search base? */
-
-	/* Prepare context and handle */
-	ac = map_init_context(module, req);
-	if (ac == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* It is easier to deal with the two different ways of
-	 * expressing the wildcard in the same codepath */
-	attrs = req->op.search.attrs;
-	if (attrs == NULL) {
-		attrs = wildcard;
-	}
-
-	/* Split local from remote attrs */
-	ret = map_attrs_collect_and_partition(module, ac, 
-					      attrs, req->op.search.tree);
-	if (ret) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* Split local from remote tree */
-	ret = ldb_parse_tree_partition(module, ac,
-				       &local_tree, &remote_tree,
-				       req->op.search.tree);
-	if (ret) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	if (((local_tree != NULL) && (remote_tree != NULL)) &&
-	    (!ldb_parse_tree_check_splittable(req->op.search.tree))) {
-		/* The query can't safely be split, enumerate the remote partition */
-		local_tree = NULL;
-		remote_tree = NULL;
-	}
-
-	if (local_tree == NULL) {
-		/* Construct default local parse tree */
-		local_tree = talloc_zero(ac, struct ldb_parse_tree);
-		if (local_tree == NULL) {
-			map_oom(ac->module);
-			return LDB_ERR_OPERATIONS_ERROR;
-		}
-
-		local_tree->operation = LDB_OP_PRESENT;
-		local_tree->u.present.attr = talloc_strdup(local_tree, IS_MAPPED);
-	}
-	if (remote_tree == NULL) {
-		/* Construct default remote parse tree */
-		remote_tree = ldb_parse_tree(ac, NULL);
-		if (remote_tree == NULL) {
-			return LDB_ERR_OPERATIONS_ERROR;
-		}
-	}
-
-	ac->local_tree = local_tree;
-
-	/* Prepare the remote operation */
-	ret = ldb_build_search_req_ex(&remote_req, ldb, ac,
-				      req->op.search.base,
-				      req->op.search.scope,
-				      remote_tree,
-				      ac->remote_attrs,
-				      req->controls,
-				      ac, map_remote_search_callback,
-				      req);
-	LDB_REQ_SET_LOCATION(remote_req);
-	if (ret != LDB_SUCCESS) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return ldb_next_remote_request(module, remote_req);
-}
-
-/* Now, search the local part of a remote search result. */
-static int map_remote_search_callback(struct ldb_request *req,
-					struct ldb_reply *ares)
-{
-	struct map_context *ac;
-	int ret;
-
-	ac = talloc_get_type(req->context, struct map_context);
-
-	if (!ares) {
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-	if (ares->error != LDB_SUCCESS) {
-		return ldb_module_done(ac->req, ares->controls,
-					ares->response, ares->error);
-	}
-
-	switch (ares->type) {
-	case LDB_REPLY_REFERRAL:
-
-		/* ignore referrals */
-		talloc_free(ares);
-		return LDB_SUCCESS;
-
-	case LDB_REPLY_ENTRY:
-
-		/* Map result record into a local message */
-		ret = map_reply_remote(ac, ares);
-		if (ret) {
-			talloc_free(ares);
-			return ldb_module_done(ac->req, NULL, NULL,
-						LDB_ERR_OPERATIONS_ERROR);
-		}
-
-		/* if we have no local db, then we can just return the reply to
-		 * the upper layer, otherwise we must save it and process it
-		 * when all replies ahve been gathered */
-		if ( ! map_check_local_db(ac->module)) {
-			ret = map_return_entry(ac, ares);
-		} else {
-			ret = map_save_entry(ac,ares);
-		}
-
-		if (ret != LDB_SUCCESS) {
-			talloc_free(ares);
-			return ldb_module_done(ac->req, NULL, NULL,
-						LDB_ERR_OPERATIONS_ERROR);
-		}
-		break;
-
-	case LDB_REPLY_DONE:
-
-		if ( ! map_check_local_db(ac->module)) {
-			return ldb_module_done(ac->req, ares->controls,
-						ares->response, LDB_SUCCESS);
-		}
-
-		/* reset the pointer to the start of the list */
-		ac->r_current = ac->r_list;
-
-		/* no entry just return */
-		if (ac->r_current == NULL) {
-			ret = ldb_module_done(ac->req, ares->controls,
-						ares->response, LDB_SUCCESS);
-			talloc_free(ares);
-			return ret;
-		}
-
-		ac->remote_done_ares = talloc_steal(ac, ares);
-
-		ret = map_search_local(ac);
-		if (ret != LDB_SUCCESS) {
-			return ldb_module_done(ac->req, NULL, NULL, ret);
-		}
-	}
-
-	return LDB_SUCCESS;
-}
-
-static int map_search_local(struct map_context *ac)
-{
-	struct ldb_request *search_req;
-
-	if (ac->r_current == NULL || ac->r_current->remote == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* Prepare local search request */
-	/* TODO: use GUIDs here instead? */
-	search_req = map_search_base_req(ac,
-					 ac->r_current->remote->message->dn,
-					 NULL, NULL,
-					 ac, map_local_merge_callback);
-	if (search_req == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return ldb_next_request(ac->module, search_req);
-}
-
-/* Merge the remote and local parts of a search result. */
-int map_local_merge_callback(struct ldb_request *req, struct ldb_reply *ares)
-{
-	struct ldb_context *ldb;
-	struct map_context *ac;
-	int ret;
-
-	ac = talloc_get_type(req->context, struct map_context);
-	ldb = ldb_module_get_ctx(ac->module);
-
-	if (!ares) {
-		return ldb_module_done(ac->req, NULL, NULL,
-					LDB_ERR_OPERATIONS_ERROR);
-	}
-	if (ares->error != LDB_SUCCESS) {
-		return ldb_module_done(ac->req, ares->controls,
-					ares->response, ares->error);
-	}
-
-	switch (ares->type) {
-	case LDB_REPLY_ENTRY:
-		/* We have already found a local record */
-		if (ac->r_current->local) {
-			talloc_free(ares);
-			ldb_set_errstring(ldb, "ldb_map: Too many results!");
-			return ldb_module_done(ac->req, NULL, NULL,
-						LDB_ERR_OPERATIONS_ERROR);
-		}
-
-		/* Store local result */
-		ac->r_current->local = talloc_steal(ac->r_current, ares);
-
-		break;
-
-	case LDB_REPLY_REFERRAL:
-		/* ignore referrals */
-		talloc_free(ares);
-		break;
-
-	case LDB_REPLY_DONE:
-		/* We don't need the local 'ares', but we will use the remote one from below */
-		talloc_free(ares);
-
-		/* No local record found, map and send remote record */
-		if (ac->r_current->local != NULL) {
-			/* Merge remote into local message */
-			ret = ldb_msg_merge_local(ac->module,
-						  ac->r_current->local->message,
-						  ac->r_current->remote->message);
-			if (ret == LDB_SUCCESS) {
-				ret = map_return_entry(ac, ac->r_current->local);
-			}
-			if (ret != LDB_SUCCESS) {
-				return ldb_module_done(ac->req, NULL, NULL,
-							LDB_ERR_OPERATIONS_ERROR);
-			}
-		} else {
-			ret = map_return_entry(ac, ac->r_current->remote);
-			if (ret != LDB_SUCCESS) {
-				return ldb_module_done(ac->req,
-							NULL, NULL, ret);
-			}
-		}
-
-		if (ac->r_current->next != NULL) {
-			ac->r_current = ac->r_current->next;
-			if (ac->r_current->remote->type == LDB_REPLY_ENTRY) {
-				ret = map_search_local(ac);
-				if (ret != LDB_SUCCESS) {
-					return ldb_module_done(ac->req,
-							       NULL, NULL, ret);
-				}
-				break;
-			}
-		}
-
-		/* ok we are done with all search, finally it is time to
-		 * finish operations for this module */
-		return ldb_module_done(ac->req,
-					ac->remote_done_ares->controls,
-					ac->remote_done_ares->response,
-					ac->remote_done_ares->error);
-	}
-
-	return LDB_SUCCESS;
-}
diff --git a/source4/lib/ldb/ldb_map/ldb_map_private.h b/source4/lib/ldb/ldb_map/ldb_map_private.h
deleted file mode 100644
index 7faaa99708..0000000000
--- a/source4/lib/ldb/ldb_map/ldb_map_private.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "replace.h"
-#include "system/filesys.h"
-#include "system/time.h"
-
-/* A handy macro to report Out of Memory conditions */
-#define map_oom(module) ldb_set_errstring(ldb_module_get_ctx(module), talloc_asprintf(module, "Out of Memory"));
-
-/* The type of search callback functions */
-typedef int (*ldb_map_callback_t)(struct ldb_request *, struct ldb_reply *);
-
-/* The special DN from which the local and remote base DNs are fetched */
-#define MAP_DN_NAME	"@MAP"
-#define MAP_DN_FROM	"@FROM"
-#define MAP_DN_TO	"@TO"
-
-/* Private data structures
- * ======================= */
-
-struct map_reply {
-	struct map_reply *next;
-	struct ldb_reply *remote;
-	struct ldb_reply *local;
-};
-
-/* Context data for mapped requests */
-struct map_context {
-
-	struct ldb_module *module;
-	struct ldb_request *req;
-
-	struct ldb_dn *local_dn;
-	const struct ldb_parse_tree *local_tree;
-	const char * const *local_attrs;
-	const char * const *remote_attrs;
-	const char * const *all_attrs;
-
-	struct ldb_message *local_msg;
-	struct ldb_request *remote_req;
-
-	struct map_reply *r_list;
-	struct map_reply *r_current;
-
-	/* The response continaing any controls the remote server gave */
-	struct ldb_reply *remote_done_ares;
-};
-
-/* Common operations
- * ================= */
-
-/* The following definitions come from lib/ldb/modules/ldb_map.c */
-const struct ldb_map_context *map_get_context(struct ldb_module *module);
-struct map_context *map_init_context(struct ldb_module *module,
-					struct ldb_request *req);
-
-int ldb_next_remote_request(struct ldb_module *module, struct ldb_request *request);
-
-bool map_check_local_db(struct ldb_module *module);
-bool map_attr_check_remote(const struct ldb_map_context *data, const char *attr);
-bool ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn);
-
-const struct ldb_map_attribute *map_attr_find_local(const struct ldb_map_context *data, const char *name);
-const struct ldb_map_attribute *map_attr_find_remote(const struct ldb_map_context *data, const char *name);
-
-const char *map_attr_map_local(void *mem_ctx, const struct ldb_map_attribute *map, const char *attr);
-const char *map_attr_map_remote(void *mem_ctx, const struct ldb_map_attribute *map, const char *attr);
-int map_attrs_merge(struct ldb_module *module, void *mem_ctx, const char ***attrs, const char * const *more_attrs);
-
-struct ldb_val ldb_val_map_local(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, const struct ldb_val *val);
-struct ldb_val ldb_val_map_remote(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, const struct ldb_val *val);
-
-struct ldb_dn *ldb_dn_map_local(struct ldb_module *module, void *mem_ctx, struct ldb_dn *dn);
-struct ldb_dn *ldb_dn_map_remote(struct ldb_module *module, void *mem_ctx, struct ldb_dn *dn);
-struct ldb_dn *ldb_dn_map_rebase_remote(struct ldb_module *module, void *mem_ctx, struct ldb_dn *dn);
-
-struct ldb_request *map_search_base_req(struct map_context *ac,
-					struct ldb_dn *dn,
-					const char * const *attrs,
-					const struct ldb_parse_tree *tree,
-					void *context,
-					ldb_map_callback_t callback);
-struct ldb_request *map_build_fixup_req(struct map_context *ac,
-					struct ldb_dn *olddn,
-					struct ldb_dn *newdn,
-					void *context,
-					ldb_map_callback_t callback);
-int map_subtree_collect_remote_simple(struct ldb_module *module, void *mem_ctx,
-					struct ldb_parse_tree **new,
-					const struct ldb_parse_tree *tree,
-					const struct ldb_map_attribute *map);
-int map_return_fatal_error(struct ldb_request *req,
-			   struct ldb_reply *ares);
-int map_return_normal_error(struct ldb_request *req,
-			    struct ldb_reply *ares,
-			    int error);
-
-int map_return_entry(struct map_context *ac, struct ldb_reply *ares);