diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-08-04 04:20:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:31:10 -0500 |
| commit | 8a0b044d20ae49819f26d68499bef0d869bcf143 (patch) | |
| tree | 428a93bcdd6413906eb96aaf70f5e4b16960320c | |
| parent | df9b8edff5c4015a06a12e13d14dd08c05ceb25c (diff) | |
| download | samba-8a0b044d20ae49819f26d68499bef0d869bcf143.tar.gz samba-8a0b044d20ae49819f26d68499bef0d869bcf143.tar.bz2 samba-8a0b044d20ae49819f26d68499bef0d869bcf143.zip | |
r9042: fixed the valgrind error in the RAW-SFILEINFO test
(This used to be commit eaf079e33f3e2d933b7310cf076d572b6988cbb4)
| -rw-r--r-- | source4/torture/raw/setfileinfo.c | 9 | ||||
| -rw-r--r-- | source4/torture/torture_util.c | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c index d34921806a..c18a607f11 100644 --- a/source4/torture/raw/setfileinfo.c +++ b/source4/torture/raw/setfileinfo.c @@ -174,6 +174,14 @@ BOOL torture_raw_sfileinfo(void) dump_all_info(mem_ctx, &finfo1); \ }} while (0) +#define CHECK_STATUS(status, correct) do { \ + if (!NT_STATUS_EQUAL(status, correct)) { \ + printf("(%s) Incorrect status %s - should be %s\n", \ + __location__, nt_errstr(status), nt_errstr(correct)); \ + ret = False; \ + goto done; \ + }} while (0) + printf("test setattr\n"); sfinfo.setattr.in.attrib = FILE_ATTRIBUTE_READONLY; @@ -485,6 +493,7 @@ BOOL torture_raw_sfileinfo(void) printf("Trying rename with a root fid\n"); status = create_directory_handle(cli->tree, BASEDIR, &d_fnum); + CHECK_STATUS(status, NT_STATUS_OK); sfinfo.rename_information.in.new_name = fnum_fname_new+strlen(BASEDIR)+1; sfinfo.rename_information.in.root_fid = d_fnum; CHECK_CALL_FNUM(RENAME_INFORMATION, NT_STATUS_INVALID_PARAMETER); diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c index ffffd21fb7..42e2608c41 100644 --- a/source4/torture/torture_util.c +++ b/source4/torture/torture_util.c @@ -58,7 +58,7 @@ NTSTATUS create_directory_handle(struct smbcli_tree *tree, const char *dname, in io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL; io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE; io.ntcreatex.in.alloc_size = 0; - io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE; + io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF; io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS; io.ntcreatex.in.security_flags = 0; io.ntcreatex.in.fname = dname; @@ -73,6 +73,7 @@ NTSTATUS create_directory_handle(struct smbcli_tree *tree, const char *dname, in return status; } + /* sometimes we need a fairly complex file to work with, so we can test all possible attributes. |