r9899: Be more conservative about what is sent to the remote server in ldb_map.

(This used to be commit 76e943d4416e38ce4cce27d5403bc3e133d0025b)

1 files changed, 9 insertions, 1 deletions

diff --git a/source4/lib/ldb/modules/ldb_map.h b/source4/lib/ldb/modules/ldb_map.h
index 4077660160..984a4a2cd5 100644
--- a/source4/lib/ldb/modules/ldb_map.h
+++ b/source4/lib/ldb/modules/ldb_map.h
@@ -81,7 +81,8 @@ struct ldb_map_attribute
 					struct ldb_module *, 
 					const char *local_attr,
 					const struct ldb_message *local, 
-					struct ldb_message *remote);
+					struct ldb_message *remote_mp,
+					struct ldb_message *remote_fb);
 
 			/* 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 
@@ -92,15 +93,22 @@ struct ldb_map_attribute
 	} u;
 };
 
+#define LDB_MAP_MAX_SUBCLASSES 	10
+#define LDB_MAP_MAX_MUSTS 		10
+#define LDB_MAP_MAX_MAYS 		50
 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];
 };
 
 struct ldb_map_context
 {
 	struct ldb_map_attribute *attribute_maps;
+	/* NOTE: Always declare base classes first here */
 	const struct ldb_map_objectclass *objectclass_maps;
 	struct ldb_context *mapped_ldb;
 };