From 1692b2e571d4c692eae020522d298b6fca3f1804 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 18 Nov 2005 09:51:13 +0000 Subject: r11776: no need to call out to SMB to setup test files for SMB2 any more (This used to be commit dae70c5baed7d5613d793dca15dda3007c1a690a) --- source4/torture/smb2/scan.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'source4/torture/smb2/scan.c') diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index 908dac3e11..81e0bea69a 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -48,15 +48,19 @@ BOOL torture_smb2_getinfo_scan(void) return False; } - if (!torture_setup_complex_file(FNAME)) { + status = torture_setup_complex_file(tree, FNAME); + if (!NT_STATUS_IS_OK(status)) { printf("Failed to setup complex file '%s'\n", FNAME); + return False; } - torture_setup_complex_file(FNAME ":2ndstream"); + torture_setup_complex_file(tree, FNAME ":2ndstream"); - if (!torture_setup_complex_dir(DNAME)) { + status = torture_setup_complex_dir(tree, DNAME); + if (!NT_STATUS_IS_OK(status)) { printf("Failed to setup complex dir '%s'\n", DNAME); + return False; } - torture_setup_complex_file(DNAME ":2ndstream"); + torture_setup_complex_file(tree, DNAME ":2ndstream"); torture_smb2_testfile(tree, FNAME, &fhandle); torture_smb2_testdir(tree, DNAME, &dhandle); @@ -112,10 +116,12 @@ BOOL torture_smb2_setinfo_scan(void) return False; } - if (!torture_setup_complex_file(FNAME)) { + status = torture_setup_complex_file(tree, FNAME); + if (!NT_STATUS_IS_OK(status)) { printf("Failed to setup complex file '%s'\n", FNAME); + return False; } - torture_setup_complex_file(FNAME ":2ndstream"); + torture_setup_complex_file(tree, FNAME ":2ndstream"); torture_smb2_testfile(tree, FNAME, &handle); -- cgit