summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-26 11:10:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:04:47 -0500
commit991588e70cf717fb1e9267defb9b14e949a70230 (patch)
tree8eb01f18de18932920133741392d0da14cc48f73
parent1fa9cb1449c5022f3ea55c4d9ceb02d2cd761cbf (diff)
downloadsamba-991588e70cf717fb1e9267defb9b14e949a70230.tar.gz
samba-991588e70cf717fb1e9267defb9b14e949a70230.tar.bz2
samba-991588e70cf717fb1e9267defb9b14e949a70230.zip
r3259: expanded the RAW-SEARCH test some more
(This used to be commit cc58d249f973397bf800c9b56a5d4ab30fcda2b4)
-rw-r--r--source4/torture/raw/search.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 39dd721a76..56e3d4dc15 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -662,7 +662,7 @@ static BOOL test_many_files(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
QSORT_CAST search_old_compare);
}
- for (i=0;i<num_files;i++) {
+ for (i=0;i<result.count;i++) {
const char *s;
if (search_types[t].level == RAW_SEARCH_BOTH_DIRECTORY_INFO) {
s = result.list[i].both_directory_info.name.s;
@@ -761,7 +761,7 @@ static BOOL test_modify_search(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
smbcli_close(cli->tree, fnum);
}
- printf("pulling the first 2 files\n");
+ printf("pulling the first file\n");
ZERO_STRUCT(result);
result.mem_ctx = talloc(mem_ctx, 0);
@@ -777,6 +777,7 @@ static BOOL test_modify_search(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
CHECK_STATUS(status, NT_STATUS_OK);
CHECK_VALUE(result.count, 1);
+ printf("pulling the second file\n");
io2.generic.level = RAW_SEARCH_BOTH_DIRECTORY_INFO;
io2.t2fnext.in.handle = io.t2ffirst.out.handle;
io2.t2fnext.in.max_count = 1;
@@ -801,6 +802,7 @@ static BOOL test_modify_search(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
torture_set_file_attribute(cli->tree, BASEDIR "\\T015-15.txt", FILE_ATTRIBUTE_HIDDEN);
torture_set_file_attribute(cli->tree, BASEDIR "\\T016-16.txt", FILE_ATTRIBUTE_NORMAL);
torture_set_file_attribute(cli->tree, BASEDIR "\\T017-17.txt", FILE_ATTRIBUTE_SYSTEM);
+ torture_set_file_attribute(cli->tree, BASEDIR "\\T018-18.txt", 0);
sfinfo.generic.level = RAW_SFILEINFO_DISPOSITION_INFORMATION;
sfinfo.generic.file.fnum = fnum;
sfinfo.disposition_info.in.delete_on_close = 1;