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

[vlendec at samba.org]

Author: vlendec
Date: 2007-08-17 19:48:27 +0000 (Fri, 17 Aug 2007)
New Revision: 24529

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

Log:
Against samba3, treat EAS_NOT_SUPPORTED as acceptable for t2open

Many hosts in the build farm don't have EA support

Modified:
   branches/SAMBA_4_0/source/torture/raw/samba3misc.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/samba3misc.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/samba3misc.c	2007-08-17 19:47:22 UTC (rev 24528)
+++ branches/SAMBA_4_0/source/torture/raw/samba3misc.c	2007-08-17 19:48:27 UTC (rev 24529)
@@ -537,9 +537,17 @@
 	CHECK_STATUS(status, NT_STATUS_DOS(ERRDOS,ERRfilexists));
 
 	status = raw_smbcli_t2open(cli_nt->tree, fpath, O_RDONLY | O_CREAT| O_EXCL, DENY_NONE, NULL);
-	CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_COLLISION);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_EAS_NOT_SUPPORTED)
+	    || !lp_parm_bool(-1, "torture", "samba3", False)) {
+		/* Against samba3, treat EAS_NOT_SUPPORTED as acceptable */
+		CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_COLLISION);
+	}
 	status = raw_smbcli_t2open(cli_dos->tree, fpath, O_RDONLY | O_CREAT| O_EXCL, DENY_NONE, NULL);
-	CHECK_STATUS(status, NT_STATUS_DOS(ERRDOS,ERRfilexists));
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_DOS(ERRDOS,ERReasnotsupported))
+	    || !lp_parm_bool(-1, "torture", "samba3", False)) {
+		/* Against samba3, treat EAS_NOT_SUPPORTED as acceptable */
+		CHECK_STATUS(status, NT_STATUS_DOS(ERRDOS,ERRfilexists));
+	}
 
 	status = raw_smbcli_ntcreate(cli_nt->tree, fpath, NULL);
 	CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_COLLISION);