summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-07 12:13:26 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-09 12:40:08 +0200
commit8d4a8389bb2df77ff8923dda8368aa2915652c1a (patch)
treeaba02d7ca688a18a9ecfa2beccfe4e1b8d464c72 /source3/smbd
parent5e26e94092b56ee47e7ec7837f7cd0feb3fb0119 (diff)
downloadsamba-8d4a8389bb2df77ff8923dda8368aa2915652c1a.tar.gz
samba-8d4a8389bb2df77ff8923dda8368aa2915652c1a.tar.bz2
samba-8d4a8389bb2df77ff8923dda8368aa2915652c1a.zip
s3-talloc Change TALLOC_MEMDUP() to talloc_memdup()
Using the standard macro makes it easier to move code into common, as TALLOC_MEMDUP isn't standard talloc.
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/process.c2
-rw-r--r--source3/smbd/trans2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 75fa69782e..f3f532fbae 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -321,7 +321,7 @@ static NTSTATUS receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
/* Copy the header we've written. */
- *buffer = (char *)TALLOC_MEMDUP(mem_ctx,
+ *buffer = (char *)talloc_memdup(mem_ctx,
writeX_header,
sizeof(writeX_header));
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 92ac78c6e9..ae6eb59451 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5301,7 +5301,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
}
/* Copy the lock range data. */
- lock_data = (char *)TALLOC_MEMDUP(
+ lock_data = (char *)talloc_memdup(
req, pdata, total_data);
if (!lock_data) {
reply_nterror(req, NT_STATUS_NO_MEMORY);