diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-08-17 19:48:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:11 -0500 |
| commit | fb19fe7a512db0da16b9dfe226f51d99b86df0a6 (patch) | |
| tree | 10246b19d32693c047612c0ea39f3cacd7704444 /source4/torture | |
| parent | 75564a9d0ece0c050923339b09457bc3dd1a5f5d (diff) | |
| download | samba-fb19fe7a512db0da16b9dfe226f51d99b86df0a6.tar.gz samba-fb19fe7a512db0da16b9dfe226f51d99b86df0a6.tar.bz2 samba-fb19fe7a512db0da16b9dfe226f51d99b86df0a6.zip | |
r24529: Against samba3, treat EAS_NOT_SUPPORTED as acceptable for t2open
Many hosts in the build farm don't have EA support
(This used to be commit 3cca299c72e0ae7da3d28d7284f1993eef9f1cea)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/raw/samba3misc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c index fe413495ea..e36be6436a 100644 --- a/source4/torture/raw/samba3misc.c +++ b/source4/torture/raw/samba3misc.c @@ -537,9 +537,17 @@ BOOL torture_samba3_badpath(struct torture_context *torture) 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); |