From 3c028ff88b7f8b4a19a058ee44aeb42c10f4b398 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 15 Oct 2009 18:26:19 +1100 Subject: 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. --- source4/torture/raw/unlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/torture/raw/unlink.c') diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c index 1058a58d9d..699bc30775 100644 --- a/source4/torture/raw/unlink.c +++ b/source4/torture/raw/unlink.c @@ -327,7 +327,7 @@ static bool test_delete_on_close(struct torture_context *tctx, smbcli_close(cli->tree, fnum2); op.generic.level = RAW_OPEN_NTCREATEX; - op.ntcreatex.in.root_fid = 0; + op.ntcreatex.in.root_fid.fnum = 0; op.ntcreatex.in.flags = 0; op.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL; op.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY |NTCREATEX_OPTIONS_DELETE_ON_CLOSE; @@ -359,7 +359,7 @@ static bool test_delete_on_close(struct torture_context *tctx, smbcli_close(cli->tree, fnum2); op.generic.level = RAW_OPEN_NTCREATEX; - op.ntcreatex.in.root_fid = 0; + op.ntcreatex.in.root_fid.fnum = 0; op.ntcreatex.in.flags = 0; op.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL; op.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY |NTCREATEX_OPTIONS_DELETE_ON_CLOSE; @@ -394,7 +394,7 @@ static bool test_delete_on_close(struct torture_context *tctx, /* we have a dir with a file in it, no handles open */ op.generic.level = RAW_OPEN_NTCREATEX; - op.ntcreatex.in.root_fid = 0; + op.ntcreatex.in.root_fid.fnum = 0; op.ntcreatex.in.flags = 0; op.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL; op.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY |NTCREATEX_OPTIONS_DELETE_ON_CLOSE; -- cgit