diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-15 18:26:19 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-15 20:03:00 +1100 |
| commit | 3c028ff88b7f8b4a19a058ee44aeb42c10f4b398 (patch) | |
| tree | ddac33c24d3f8c62c98e512fcbd240d1a094f5ca /source4/torture/raw/samba3misc.c | |
| parent | c73ba89112dda50e1828e11c87f8006bc4968546 (diff) | |
| download | samba-3c028ff88b7f8b4a19a058ee44aeb42c10f4b398.tar.gz samba-3c028ff88b7f8b4a19a058ee44aeb42c10f4b398.tar.bz2 samba-3c028ff88b7f8b4a19a058ee44aeb42c10f4b398.zip | |
s4-smb: declare root_fid as a file handle
In order to implement root_fid in the s4 SMB server we need to declare
it as a handle type, just as for other fnum values in SMB. This
required some extensive (but simple) changes in many bits of code.
Diffstat (limited to 'source4/torture/raw/samba3misc.c')
| -rw-r--r-- | source4/torture/raw/samba3misc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c index 6d6eabce2d..e8dc12fd40 100644 --- a/source4/torture/raw/samba3misc.c +++ b/source4/torture/raw/samba3misc.c @@ -90,7 +90,7 @@ bool torture_samba3_checkfsp(struct torture_context *torture) union smb_open io; io.generic.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.security_flags = 0; io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE; io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL; @@ -304,7 +304,7 @@ static NTSTATUS raw_smbcli_ntcreate(struct smbcli_tree *tree, const char *fname, memset(&io, '\0', sizeof(io)); io.generic.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL; io.ntcreatex.in.alloc_size = 0; io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL; @@ -887,7 +887,7 @@ bool torture_samba3_rootdirfid(struct torture_context *tctx) ZERO_STRUCT(io); io.generic.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.security_flags = 0; io.ntcreatex.in.access_mask = SEC_STD_SYNCHRONIZE | SEC_FILE_EXECUTE; @@ -912,7 +912,7 @@ bool torture_samba3_rootdirfid(struct torture_context *tctx) io.ntcreatex.in.flags = NTCREATEX_FLAGS_REQUEST_OPLOCK | NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK; - io.ntcreatex.in.root_fid = dnum; + io.ntcreatex.in.root_fid.fnum = dnum; io.ntcreatex.in.security_flags = 0; io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OVERWRITE_IF; io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL; @@ -961,7 +961,7 @@ bool torture_samba3_oplock_logoff(struct torture_context *tctx) ZERO_STRUCT(io); io.generic.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.security_flags = 0; io.ntcreatex.in.access_mask = SEC_STD_SYNCHRONIZE | SEC_FILE_EXECUTE; |