diff options
author | Stefan Metzmacher <metze@samba.org> | 2006-03-12 22:48:25 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:06 -0500 |
commit | a1b295ed4823ce8d06f830b8db9a5d965c934b54 (patch) | |
tree | 2de735a28634c011930456f6591072a3c1471263 /source4/torture/raw/setfileinfo.c | |
parent | 33647bd841c1c74e7dc50e93379e372056ac2df1 (diff) | |
download | samba-a1b295ed4823ce8d06f830b8db9a5d965c934b54.tar.gz samba-a1b295ed4823ce8d06f830b8db9a5d965c934b54.tar.bz2 samba-a1b295ed4823ce8d06f830b8db9a5d965c934b54.zip |
r14256: - rename smb_file -> smb_handle
- move it into the in/out substructs again
- allow file.path only on smb_fileinfo/smb_setfileinfo
metze
(This used to be commit be6d5298a2cdb7e7c61d70471bad445645af5963)
Diffstat (limited to 'source4/torture/raw/setfileinfo.c')
-rw-r--r-- | source4/torture/raw/setfileinfo.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c index d67825925b..a48fa237aa 100644 --- a/source4/torture/raw/setfileinfo.c +++ b/source4/torture/raw/setfileinfo.c @@ -85,7 +85,7 @@ BOOL torture_raw_sfileinfo(void) check_fnum = True; \ call_name = #call; \ sfinfo.generic.level = RAW_SFILEINFO_ ## call; \ - sfinfo.generic.file.fnum = fnum; \ + sfinfo.generic.in.file.fnum = fnum; \ status = smb_raw_setfileinfo(cli->tree, &sfinfo); \ if (!NT_STATUS_EQUAL(status, rightstatus)) { \ printf("(%s) %s - %s (should be %s)\n", __location__, #call, \ @@ -93,7 +93,7 @@ BOOL torture_raw_sfileinfo(void) ret = False; \ } \ finfo1.generic.level = RAW_FILEINFO_ALL_INFO; \ - finfo1.generic.file.fnum = fnum; \ + finfo1.generic.in.file.fnum = fnum; \ status2 = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo1); \ if (!NT_STATUS_IS_OK(status2)) { \ printf("(%s) %s pathinfo - %s\n", __location__, #call, nt_errstr(status)); \ @@ -104,10 +104,10 @@ BOOL torture_raw_sfileinfo(void) check_fnum = False; \ call_name = #call; \ sfinfo.generic.level = RAW_SFILEINFO_ ## call; \ - sfinfo.generic.file.path = path_fname; \ + sfinfo.generic.in.file.path = path_fname; \ status = smb_raw_setpathinfo(cli->tree, &sfinfo); \ if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { \ - sfinfo.generic.file.path = path_fname_new; \ + sfinfo.generic.in.file.path = path_fname_new; \ status = smb_raw_setpathinfo(cli->tree, &sfinfo); \ } \ if (!NT_STATUS_EQUAL(status, rightstatus)) { \ @@ -116,10 +116,10 @@ BOOL torture_raw_sfileinfo(void) ret = False; \ } \ finfo1.generic.level = RAW_FILEINFO_ALL_INFO; \ - finfo1.generic.file.path = path_fname; \ + finfo1.generic.in.file.path = path_fname; \ status2 = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo1); \ if (NT_STATUS_EQUAL(status2, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { \ - finfo1.generic.file.path = path_fname_new; \ + finfo1.generic.in.file.path = path_fname_new; \ status2 = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo1); \ } \ if (!NT_STATUS_IS_OK(status2)) { \ @@ -131,13 +131,13 @@ BOOL torture_raw_sfileinfo(void) do { if (NT_STATUS_IS_OK(status)) { \ finfo2.generic.level = RAW_FILEINFO_ ## call; \ if (check_fnum) { \ - finfo2.generic.file.fnum = fnum; \ + finfo2.generic.in.file.fnum = fnum; \ status2 = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo2); \ } else { \ - finfo2.generic.file.path = path_fname; \ + finfo2.generic.in.file.path = path_fname; \ status2 = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo2); \ if (NT_STATUS_EQUAL(status2, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { \ - finfo2.generic.file.path = path_fname_new; \ + finfo2.generic.in.file.path = path_fname_new; \ status2 = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo2); \ } \ } \ @@ -556,7 +556,7 @@ BOOL torture_raw_sfileinfo_bug(void) smbcli_close(cli->tree, fnum); sfinfo.generic.level = RAW_SFILEINFO_STANDARD; - sfinfo.generic.file.path = fname; + sfinfo.generic.in.file.path = fname; sfinfo.standard.in.create_time = 0; sfinfo.standard.in.access_time = 0; |