s3:modules: pass a TALLOC_CTX to string_replace_init_map()

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/lib/adouble.c b/source3/lib/adouble.c
index 2ee5f9fab8a6456bf28c2a130b9499e4513272bd..bfb9fd2dac6990d05dfd100680ca6fd9a1c4fbfc 100644 (file)
--- a/source3/lib/adouble.c
+++ b/source3/lib/adouble.c
@@ -800,7 +800,8 @@ static bool ad_convert_xattr(vfs_handle_struct *handle,
                if (mappings == NULL) {
                        return false;
                }
-               string_replace_cmaps = string_replace_init_map(mappings);
+               string_replace_cmaps = string_replace_init_map(
+                       handle->conn->sconn, mappings);
                TALLOC_FREE(mappings);
        }
 

diff --git a/source3/modules/string_replace.c b/source3/modules/string_replace.c
index 88b53fbbf4a844783a058361dda6062ed8a2bd37..df788667d1b21ca0b39e8ba6ebe8d36b4a02f9aa 100644 (file)
--- a/source3/modules/string_replace.c
+++ b/source3/modules/string_replace.c
@@ -87,7 +87,8 @@ static bool build_ranges(struct char_mappings **cmaps,
        return True;
 }
 
-struct char_mappings **string_replace_init_map(const char **mappings)
+struct char_mappings **string_replace_init_map(TALLOC_CTX *mem_ctx,
+                                              const char **mappings)
 {
        int i;
        char *tmp;
@@ -99,7 +100,7 @@ struct char_mappings **string_replace_init_map(const char **mappings)
                return NULL;
        }
 
-       cmaps = TALLOC_ZERO(NULL, MAP_NUM * sizeof(struct char_mappings *));
+       cmaps = TALLOC_ZERO(mem_ctx, MAP_NUM * sizeof(struct char_mappings *));
        if (cmaps == NULL) {
                return NULL;
        }

diff --git a/source3/modules/string_replace.h b/source3/modules/string_replace.h
index d7c9b52c85ccfc2cc78bd8972a8c5ec79cb8ab88..b33855efd07fef181a1e3814dbe5f88489de8caf 100644 (file)
--- a/source3/modules/string_replace.h
+++ b/source3/modules/string_replace.h
@@ -22,7 +22,8 @@
 
 struct char_mappings;
 
-struct char_mappings **string_replace_init_map(const char **mappings);
+struct char_mappings **string_replace_init_map(TALLOC_CTX *mem_ctx,
+                                              const char **mappings);
 
 NTSTATUS string_replace_allocate(connection_struct *conn,
                                 const char *name_in,

diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index 762491ede3141a4151784462def60f6369986e79..2c31c873fadcb933babf4f901c2f070c66c20b81 100644 (file)
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -88,7 +88,7 @@ static struct share_mapping_entry *add_srt(int snum, const char **mappings)
                return sme;
        }
 
-       sme->mappings = string_replace_init_map(mappings);
+       sme->mappings = string_replace_init_map(sme, mappings);
 
        return sme;
 }