r26540: Revert my previous commit after concerns raised by Andrew.

(This used to be commit 6ac86f8be7d9a8c5ab396a93e6d1e6819e11f173)

1 files changed, 3 insertions, 3 deletions

diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c
index 87f5f25392..39df427c2c 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/source4/lib/ldb/ldb_map/ldb_map.c
@@ -867,7 +867,7 @@ static int map_objectclass_convert_operator(struct ldb_module *module, void *mem
 					    struct ldb_parse_tree **new, const struct ldb_parse_tree *tree) 
 {
 	
-	const struct ldb_map_attribute objectclass_map = {
+	static const struct ldb_map_attribute objectclass_map = {
 		.local_name = "objectClass",
 		.type = MAP_CONVERT,
 		.u = {
@@ -956,7 +956,7 @@ struct ldb_request *map_search_self_req(struct map_context *ac, struct ldb_dn *d
 	/* 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 */
-	const char * const attrs[] = { IS_MAPPED, NULL };
+	static const char * const attrs[] = { IS_MAPPED, NULL };
 	struct ldb_parse_tree *tree;
 
 	/* Limit search to records with 'IS_MAPPED' present */
@@ -1242,7 +1242,7 @@ static const struct ldb_map_attribute builtin_attribute_maps[] = {
  * base DNs in private data. */
 static int map_init_dns(struct ldb_module *module, struct ldb_map_context *data, const char *name)
 {
-	const char * const attrs[] = { MAP_DN_FROM, MAP_DN_TO, NULL };
+	static const char * const attrs[] = { MAP_DN_FROM, MAP_DN_TO, NULL };
 	struct ldb_dn *dn;
 	struct ldb_message *msg;
 	struct ldb_result *res;