summaryrefslogtreecommitdiff
path: root/source4/ntvfs/common
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-06 02:32:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:20 -0500
commitcc55aef7c116d03ba2817625b0ba9edb378525e3 (patch)
treee36f5694a422c5b80cb1f631c9dd182994aab9e2 /source4/ntvfs/common
parent66bd6142a2fc4679e1d6cc98237a23927dda5f63 (diff)
downloadsamba-cc55aef7c116d03ba2817625b0ba9edb378525e3.tar.gz
samba-cc55aef7c116d03ba2817625b0ba9edb378525e3.tar.bz2
samba-cc55aef7c116d03ba2817625b0ba9edb378525e3.zip
r4547: - added talloc_new(ctx) macro that is a neater form of the common talloc(ctx, 0) call.
- cleaned up some talloc usage in various files I'd like to get to the point that we have no calls to talloc(), at which point we will rename talloc_p() to talloc(), to encourage everyone to use the typesafe functions. (This used to be commit e6c81d7c9f8a6938947d3c1c8a971a0d6d50b67a)
Diffstat (limited to 'source4/ntvfs/common')
-rw-r--r--source4/ntvfs/common/sidmap.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/ntvfs/common/sidmap.c b/source4/ntvfs/common/sidmap.c
index 89ad2e2430..3254330c2f 100644
--- a/source4/ntvfs/common/sidmap.c
+++ b/source4/ntvfs/common/sidmap.c
@@ -94,7 +94,7 @@ static NTSTATUS sidmap_primary_domain_sid(struct sidmap_context *sidmap,
TALLOC_CTX *mem_ctx, struct dom_sid **sid)
{
const char *attrs[] = { "objectSid", NULL };
- void *ctx = talloc(mem_ctx, 0);
+ void *ctx = talloc_new(mem_ctx);
const char *sidstr;
int ret;
struct ldb_message **res;
@@ -138,7 +138,7 @@ NTSTATUS sidmap_sid_to_unixuid(struct sidmap_context *sidmap,
struct dom_sid *domain_sid;
NTSTATUS status;
- ctx = talloc(sidmap, 0);
+ ctx = talloc_new(sidmap);
sidstr = dom_sid_string(ctx, sid);
if (sidstr == NULL) {
talloc_free(ctx);
@@ -237,7 +237,7 @@ NTSTATUS sidmap_sid_to_unixgid(struct sidmap_context *sidmap,
NTSTATUS status;
struct dom_sid *domain_sid;
- ctx = talloc(sidmap, 0);
+ ctx = talloc_new(sidmap);
sidstr = dom_sid_string(ctx, sid);
if (sidstr == NULL) {
talloc_free(ctx);
@@ -349,7 +349,7 @@ NTSTATUS sidmap_uid_to_sid(struct sidmap_context *sidmap,
*/
- ctx = talloc(sidmap, 0);
+ ctx = talloc_new(sidmap);
/*
@@ -461,7 +461,7 @@ NTSTATUS sidmap_gid_to_sid(struct sidmap_context *sidmap,
*/
- ctx = talloc(sidmap, 0);
+ ctx = talloc_new(sidmap);
/*
@@ -553,7 +553,7 @@ NTSTATUS sidmap_allocated_sid_lookup(struct sidmap_context *sidmap,
{
NTSTATUS status;
struct dom_sid *domain_sid;
- void *ctx = talloc(mem_ctx, 0);
+ void *ctx = talloc_new(mem_ctx);
uint32_t rid;
status = sidmap_primary_domain_sid(sidmap, ctx, &domain_sid);