svn commit: samba r9042 - in branches/SAMBA_4_0/source/torture: . raw

[tridge at samba.org]

Author: tridge
Date: 2005-08-04 04:20:26 +0000 (Thu, 04 Aug 2005)
New Revision: 9042

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9042

Log:
fixed the valgrind error in the RAW-SFILEINFO test






Modified:
   branches/SAMBA_4_0/source/torture/raw/setfileinfo.c
   branches/SAMBA_4_0/source/torture/torture_util.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/setfileinfo.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/setfileinfo.c	2005-08-04 03:25:33 UTC (rev 9041)
+++ branches/SAMBA_4_0/source/torture/raw/setfileinfo.c	2005-08-04 04:20:26 UTC (rev 9042)
@@ -174,6 +174,14 @@
 		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 @@
 
 	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);

Modified: branches/SAMBA_4_0/source/torture/torture_util.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture_util.c	2005-08-04 03:25:33 UTC (rev 9041)
+++ branches/SAMBA_4_0/source/torture/torture_util.c	2005-08-04 04:20:26 UTC (rev 9042)
@@ -58,7 +58,7 @@
 	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 @@
 	return status;
 }
 
+
 /*
   sometimes we need a fairly complex file to work with, so we can test
   all possible attributes.