summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-03 18:02:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:06 -0500
commitae650da0b81700d4e62814cdff8ab57536f07ccb (patch)
treea0bd27fa9fd4cc7aa07f461c97f92af4b7457cea
parent6eb9567c3f68869f691e29d5daffe3ea28858a46 (diff)
downloadsamba-ae650da0b81700d4e62814cdff8ab57536f07ccb.tar.gz
samba-ae650da0b81700d4e62814cdff8ab57536f07ccb.tar.bz2
samba-ae650da0b81700d4e62814cdff8ab57536f07ccb.zip
r9010: forgot to commit the change to create_directory_handle()
(This used to be commit 8d5238049376fb5887bdd478d7e3caa80ff1c6d0)
-rw-r--r--source4/torture/torture_util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index 176a8e101b..ffffd21fb7 100644
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -42,7 +42,7 @@ BOOL torture_setup_dir(struct smbcli_state *cli, const char *dname)
/*
create a directory, returning a handle to it
*/
-int create_directory_handle(struct smbcli_tree *tree, const char *dname)
+NTSTATUS create_directory_handle(struct smbcli_tree *tree, const char *dname, int *fnum)
{
NTSTATUS status;
union smb_open io;
@@ -64,13 +64,13 @@ int create_directory_handle(struct smbcli_tree *tree, const char *dname)
io.ntcreatex.in.fname = dname;
status = smb_raw_open(tree, mem_ctx, &io);
- if (!NT_STATUS_IS_OK(status)) {
- talloc_free(mem_ctx);
- return -1;
+ talloc_free(mem_ctx);
+
+ if (NT_STATUS_IS_OK(status)) {
+ *fnum = io.ntcreatex.out.fnum;
}
- talloc_free(mem_ctx);
- return io.ntcreatex.out.fnum;
+ return status;
}
/*