util_str: setup the correct talloc name for strings

metze
(partly from samba4wins tree 447e7f9532131117e896712db9def321c96718eb)

diff --git a/lib/util/substitute.c b/lib/util/substitute.c
index 84514ac7147bf48b32da838a6dd796d0347262d2..32945a721340529a5d7c41d8f70bf9f01fc12b71 100644 (file)
--- a/lib/util/substitute.c
+++ b/lib/util/substitute.c
@@ -120,6 +120,8 @@ _PUBLIC_ char *string_sub_talloc(TALLOC_CTX *mem_ctx, const char *s,
 
        SMB_ASSERT(ret[len] == '\0');
 
+       talloc_set_name_const(ret, ret);
+
        return ret;
 }
 

diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index 7dcefc90ddab705b87ce0d71ede92f180cc31530..a2c50fd38f7540533095ddcd2798b03cd96039b6 100644 (file)
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -153,6 +153,8 @@ _PUBLIC_ const char *str_format_nbt_domain(TALLOC_CTX *mem_ctx, const char *s)
                }
        }
 
+       talloc_set_name_const(ret, ret);
+
        return ret;
 }
 

diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index 8cabac6d042c467b235e5cc20b0ed3bbacbea050..63de051b33273c08dd75e0995c8fa6d9a8b930ea 100644 (file)
--- a/source4/libcli/raw/rawfile.c
+++ b/source4/libcli/raw/rawfile.c
@@ -71,6 +71,8 @@ char *attrib_string(TALLOC_CTX *mem_ctx, uint32_t attrib)
 
        ret[len] = 0;
 
+       talloc_set_name_const(ret, ret);
+
        return ret;
 }