summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-03-17 21:08:03 +0100
committerGünther Deschner <gd@samba.org>2011-03-18 01:24:06 +0100
commit4a48c9d4ac20eefd8bd73525fa29deacece0873b (patch)
tree0198a9a0b1c26d45faae3ac2a089cf8f62086c06 /source4
parentac851935e2ca7c7cc27f3202b9104ce1070240f3 (diff)
downloadsamba-4a48c9d4ac20eefd8bd73525fa29deacece0873b.tar.gz
samba-4a48c9d4ac20eefd8bd73525fa29deacece0873b.tar.bz2
samba-4a48c9d4ac20eefd8bd73525fa29deacece0873b.zip
s4-smbtorture: use torture_context in raw.eas test.
Guenther
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/raw/eas.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index 910f85fe37..1072b198cf 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -45,7 +45,7 @@ static bool check_ea(struct smbcli_state *cli,
return NT_STATUS_IS_OK(status);
}
-static bool test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_eas(struct smbcli_state *cli, struct torture_context *tctx)
{
NTSTATUS status;
union smb_setfileinfo setfile;
@@ -70,7 +70,7 @@ static bool test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
io.ntcreatex.in.security_flags = 0;
io.ntcreatex.in.fname = fname;
- status = smb_raw_open(cli->tree, mem_ctx, &io);
+ status = smb_raw_open(cli->tree, tctx, &io);
CHECK_STATUS(status, NT_STATUS_OK);
fnum = io.ntcreatex.out.file.fnum;
@@ -80,7 +80,7 @@ static bool test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
setfile.generic.level = RAW_SFILEINFO_EA_SET;
setfile.generic.in.file.fnum = fnum;
setfile.ea_set.in.num_eas = 2;
- setfile.ea_set.in.eas = talloc_array(mem_ctx, struct ea_struct, 2);
+ setfile.ea_set.in.eas = talloc_array(tctx, struct ea_struct, 2);
setfile.ea_set.in.eas[0].flags = 0;
setfile.ea_set.in.eas[0].name.s = "EAONE";
setfile.ea_set.in.eas[0].value = data_blob_string_const("VALUE1");
@@ -362,7 +362,7 @@ done:
/*
test using NTTRANS CREATE to create a file with an initial EA set
*/
-static bool test_nttrans_create(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context *tctx)
{
NTSTATUS status;
union smb_open io;
@@ -407,7 +407,7 @@ static bool test_nttrans_create(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
io.ntcreatex.in.ea_list = &ea_list;
io.ntcreatex.in.sec_desc = NULL;
- status = smb_raw_open(cli->tree, mem_ctx, &io);
+ status = smb_raw_open(cli->tree, tctx, &io);
CHECK_STATUS(status, NT_STATUS_OK);
fnum = io.ntcreatex.out.file.fnum;
@@ -427,7 +427,7 @@ static bool test_nttrans_create(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
eas[0].name.s = "Fourth EA";
eas[0].value = data_blob_string_const("Value Four");
- status = smb_raw_open(cli->tree, mem_ctx, &io);
+ status = smb_raw_open(cli->tree, tctx, &io);
CHECK_STATUS(status, NT_STATUS_OK);
fnum = io.ntcreatex.out.file.fnum;