diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-05-20 10:46:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:11 -0500 |
| commit | e306c5bf129a981693bd251d45597f1e584ee850 (patch) | |
| tree | 54e78bf5ba441d9f780d1e987cd9ff72b0911f23 /source4/torture/smb2/util.c | |
| parent | 2de1d5f7a8c2a3a815d81c217c274d2d5f1768cb (diff) | |
| download | samba-e306c5bf129a981693bd251d45597f1e584ee850.tar.gz samba-e306c5bf129a981693bd251d45597f1e584ee850.tar.bz2 samba-e306c5bf129a981693bd251d45597f1e584ee850.zip | |
r15741: move smb2 request structures into the main smb request structs
as new levels
metze
(This used to be commit 91806353174704857dfcc15a730af7232cfde660)
Diffstat (limited to 'source4/torture/smb2/util.c')
| -rw-r--r-- | source4/torture/smb2/util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 70be00f5fd..89c5488426 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -37,7 +37,7 @@ NTSTATUS smb2_util_close(struct smb2_tree *tree, struct smb2_handle h) struct smb2_close c; ZERO_STRUCT(c); - c.in.handle = h; + c.in.file.handle = h; return smb2_close(tree, &c); } @@ -67,7 +67,7 @@ NTSTATUS smb2_util_unlink(struct smb2_tree *tree, const char *fname) } NT_STATUS_NOT_OK_RETURN(status); - return smb2_util_close(tree, io.out.handle); + return smb2_util_close(tree, io.out.file.handle); } /* @@ -80,8 +80,8 @@ NTSTATUS smb2_util_write(struct smb2_tree *tree, struct smb2_write w; ZERO_STRUCT(w); + w.in.file.handle = handle; w.in.offset = offset; - w.in.handle = handle; w.in.data = data_blob_const(buf, size); return smb2_write(tree, &w); @@ -135,7 +135,7 @@ static NTSTATUS smb2_create_complex(struct smb2_tree *tree, const char *fname, talloc_free(tmp_ctx); NT_STATUS_NOT_OK_RETURN(status); - *handle = io.out.handle; + *handle = io.out.file.handle; if (!dir) { status = smb2_util_write(tree, *handle, buf, 0, sizeof(buf)); @@ -332,12 +332,12 @@ NTSTATUS torture_smb2_testfile(struct smb2_tree *tree, const char *fname, status = smb2_create(tree, tree, &io); NT_STATUS_NOT_OK_RETURN(status); - *handle = io.out.handle; + *handle = io.out.file.handle; ZERO_STRUCT(r); + r.in.file.handle = *handle; r.in.length = 5; r.in.offset = 0; - r.in.handle = *handle; smb2_read(tree, tree, &r); @@ -365,7 +365,7 @@ NTSTATUS torture_smb2_testdir(struct smb2_tree *tree, const char *fname, status = smb2_create(tree, tree, &io); NT_STATUS_NOT_OK_RETURN(status); - *handle = io.out.handle; + *handle = io.out.file.handle; return NT_STATUS_OK; } @@ -417,7 +417,7 @@ NTSTATUS smb2_util_roothandle(struct smb2_tree *tree, struct smb2_handle *handle status = smb2_create(tree, tree, &io); NT_STATUS_NOT_OK_RETURN(status); - *handle = io.out.handle; + *handle = io.out.file.handle; return NT_STATUS_OK; } |