summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGregor Beck <gbeck@sernet.de>2012-03-02 12:02:18 +0100
committerStefan Metzmacher <metze@samba.org>2012-03-06 23:53:07 +0100
commitaf6555d2a9f3b09238aa2e9a924f08aabe9d6090 (patch)
tree48be91d1aff7b17d28fa7c595b629e5b26d3c1c3 /source4
parent80436ed0995164819935eea18e9b45f0edb7f849 (diff)
downloadsamba-af6555d2a9f3b09238aa2e9a924f08aabe9d6090.tar.gz
samba-af6555d2a9f3b09238aa2e9a924f08aabe9d6090.tar.bz2
samba-af6555d2a9f3b09238aa2e9a924f08aabe9d6090.zip
s4:torture: use different filenames for smb2 setinfo and getinfo scan
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/smb2/scan.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c
index 8d2035ab3f..c16dd3aff1 100644
--- a/source4/torture/smb2/scan.c
+++ b/source4/torture/smb2/scan.c
@@ -29,10 +29,6 @@
#include "torture/smb2/proto.h"
-#define FNAME "scan-getinfo.dat"
-#define DNAME "scan-getinfo.dir"
-
-
/*
scan for valid SMB2 getinfo levels
*/
@@ -44,6 +40,11 @@ bool torture_smb2_getinfo_scan(struct torture_context *torture)
struct smb2_handle fhandle, dhandle;
int c, i;
+ static const char *FNAME = "scan-getinfo.dat";
+ static const char *FNAME2 = "scan-getinfo.dat:2ndstream";
+ static const char *DNAME = "scan-getinfo.dir";
+ static const char *DNAME2 = "scan-getinfo.dir:2ndstream";
+
if (!torture_smb2_connection(torture, &tree)) {
return false;
}
@@ -53,7 +54,7 @@ bool torture_smb2_getinfo_scan(struct torture_context *torture)
printf("Failed to setup complex file '%s'\n", FNAME);
return false;
}
- torture_setup_complex_file(tree, FNAME ":2ndstream");
+ torture_setup_complex_file(tree, FNAME2);
status = torture_setup_complex_dir(tree, DNAME);
if (!NT_STATUS_IS_OK(status)) {
@@ -61,7 +62,7 @@ bool torture_smb2_getinfo_scan(struct torture_context *torture)
smb2_util_unlink(tree, FNAME);
return false;
}
- torture_setup_complex_file(tree, DNAME ":2ndstream");
+ torture_setup_complex_file(tree, DNAME2);
torture_smb2_testfile(tree, FNAME, &fhandle);
torture_smb2_testdir(tree, DNAME, &dhandle);
@@ -107,6 +108,9 @@ bool torture_smb2_getinfo_scan(struct torture_context *torture)
*/
bool torture_smb2_setinfo_scan(struct torture_context *torture)
{
+ static const char *FNAME = "scan-setinfo.dat";
+ static const char *FNAME2 = "scan-setinfo.dat:2ndstream";
+
struct smb2_tree *tree;
NTSTATUS status;
struct smb2_setinfo io;
@@ -122,7 +126,7 @@ bool torture_smb2_setinfo_scan(struct torture_context *torture)
printf("Failed to setup complex file '%s'\n", FNAME);
return false;
}
- torture_setup_complex_file(tree, FNAME ":2ndstream");
+ torture_setup_complex_file(tree, FNAME2);
torture_smb2_testfile(tree, FNAME, &handle);