summaryrefslogtreecommitdiff
path: root/source3/sam
diff options
context:
space:
mode:
Diffstat (limited to 'source3/sam')
-rw-r--r--source3/sam/account.c2
-rw-r--r--source3/sam/group.c2
-rw-r--r--source3/sam/gums_api.c2
-rw-r--r--source3/sam/gums_helper.c4
-rw-r--r--source3/sam/interface.c2
-rwxr-xr-xsource3/sam/sam_ads.c8
6 files changed, 10 insertions, 10 deletions
diff --git a/source3/sam/account.c b/source3/sam/account.c
index 1b43db57d9..b8336146cd 100644
--- a/source3/sam/account.c
+++ b/source3/sam/account.c
@@ -103,7 +103,7 @@ NTSTATUS sam_init_account(SAM_ACCOUNT_HANDLE **account)
TALLOC_CTX *mem_ctx;
NTSTATUS nt_status;
- mem_ctx = talloc_init_named("sam internal SAM_ACCOUNT_HANDLE allocation");
+ mem_ctx = talloc_init("sam internal SAM_ACCOUNT_HANDLE allocation");
if (!mem_ctx) {
DEBUG(0,("sam_init_account: error while doing talloc_init()\n"));
diff --git a/source3/sam/group.c b/source3/sam/group.c
index 7e4bcc1425..101e3dd7ce 100644
--- a/source3/sam/group.c
+++ b/source3/sam/group.c
@@ -83,7 +83,7 @@ NTSTATUS sam_init_group(SAM_GROUP_HANDLE **group)
TALLOC_CTX *mem_ctx;
NTSTATUS nt_status;
- mem_ctx = talloc_init_named("sam internal SAM_GROUP_HANDLE allocation");
+ mem_ctx = talloc_init("sam internal SAM_GROUP_HANDLE allocation");
if (!mem_ctx) {
DEBUG(0,("sam_init_group: error while doing talloc_init()\n"));
diff --git a/source3/sam/gums_api.c b/source3/sam/gums_api.c
index 1d67467b2b..0061988eea 100644
--- a/source3/sam/gums_api.c
+++ b/source3/sam/gums_api.c
@@ -795,7 +795,7 @@ NTSTATUS gums_create_commit_set(GUMS_COMMIT_SET **com_set, TALLOC_CTX *ctx, DOM_
TALLOC_CTX *mem_ctx;
GUMS_COMMIT_SET *set;
- mem_ctx = talloc_init_named("commit_set");
+ mem_ctx = talloc_init("commit_set");
if (mem_ctx == NULL)
return NT_STATUS_NO_MEMORY;
set = (GUMS_COMMIT_SET *)talloc(mem_ctx, sizeof(GUMS_COMMIT_SET));
diff --git a/source3/sam/gums_helper.c b/source3/sam/gums_helper.c
index d581d6574e..8526a2f1cc 100644
--- a/source3/sam/gums_helper.c
+++ b/source3/sam/gums_helper.c
@@ -372,7 +372,7 @@ NTSTATUS gums_init_builtin_groups(void)
g_obj.type = GUMS_OBJ_GROUP;
g_obj.version = 1;
g_obj.seq_num = 0;
- g_obj.mem_ctx = talloc_init_named("gums_init_backend_acct");
+ g_obj.mem_ctx = talloc_init("gums_init_backend_acct");
if (g_obj.mem_ctx == NULL) {
DEBUG(0, ("gums_init_backend: Out of Memory!\n"));
return NT_STATUS_NO_MEMORY;
@@ -591,7 +591,7 @@ NTSTATUS gums_init_builtin_groups(void)
g_priv.type = GUMS_OBJ_GROUP;
g_priv.version = 1;
g_priv.seq_num = 0;
- g_priv.mem_ctx = talloc_init_named("gums_init_backend_priv");
+ g_priv.mem_ctx = talloc_init("gums_init_backend_priv");
if (g_priv.mem_ctx == NULL) {
DEBUG(0, ("gums_init_backend: Out of Memory!\n"));
return NT_STATUS_NO_MEMORY;
diff --git a/source3/sam/interface.c b/source3/sam/interface.c
index d08df42122..51ae561999 100644
--- a/source3/sam/interface.c
+++ b/source3/sam/interface.c
@@ -384,7 +384,7 @@ NTSTATUS make_sam_context(SAM_CONTEXT **context)
{
TALLOC_CTX *mem_ctx;
- mem_ctx = talloc_init_named("sam_context internal allocation context");
+ mem_ctx = talloc_init("sam_context internal allocation context");
if (!mem_ctx) {
DEBUG(0, ("make_sam_context: talloc init failed!\n"));
diff --git a/source3/sam/sam_ads.c b/source3/sam/sam_ads.c
index d2bfab53b9..13e0369004 100755
--- a/source3/sam/sam_ads.c
+++ b/source3/sam/sam_ads.c
@@ -584,8 +584,8 @@ static NTSTATUS sam_ads_get_sec_desc(const SAM_METHODS *sam_method, const NT_USE
return ads_ntstatus(ads_status);
}
- if (!(mem_ctx = talloc_init_named("sec_desc parse in sam_ads"))) {
- DEBUG(1, ("talloc_init_named() failed for sec_desc parse context in sam_ads"));
+ if (!(mem_ctx = talloc_init("sec_desc parse in sam_ads"))) {
+ DEBUG(1, ("talloc_init() failed for sec_desc parse context in sam_ads"));
ads_msgfree(ads_struct, sec_desc_res);
return NT_STATUS_NO_MEMORY;
}
@@ -1323,8 +1323,8 @@ NTSTATUS sam_init_ads(SAM_METHODS *sam_method, const char *module_params)
return NT_STATUS_NO_MEMORY;
}
- if (!(sam_ads_state->mem_ctx = talloc_init_named("sam_ads_method"))) {
- DEBUG(0, ("talloc_init_named() failed for sam_ads_state->mem_ctx\n"));
+ if (!(sam_ads_state->mem_ctx = talloc_init("sam_ads_method"))) {
+ DEBUG(0, ("talloc_init() failed for sam_ads_state->mem_ctx\n"));
return NT_STATUS_NO_MEMORY;
}