summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-12-16 14:31:54 -0800
committerTim Prouty <tprouty@samba.org>2009-12-17 17:58:35 -0800
commitf8bb5a60e71bd51971ef05a23037cac4523dee25 (patch)
tree3cf11afed7fe33283fc6fa16af7bb03887514456 /source4
parentf02206d933c2952b9b9674b94290142f269248c5 (diff)
downloadsamba-f8bb5a60e71bd51971ef05a23037cac4523dee25.tar.gz
samba-f8bb5a60e71bd51971ef05a23037cac4523dee25.tar.bz2
samba-f8bb5a60e71bd51971ef05a23037cac4523dee25.zip
s4 torture: Parameterize streams delete behavior rather than commenting out the check.
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/raw/streams.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 6b41031fcb..8fb7c0b3bb 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -607,9 +607,13 @@ static bool test_stream_delete(struct torture_context *tctx,
status = smb_raw_fileinfo(cli->tree, tctx, &finfo);
CHECK_STATUS(status, NT_STATUS_OK);
- /* w2k and w2k3 return 0 and w2k8 returns 1
- CHECK_VALUE(finfo.all_info.out.delete_pending, 0);
- */
+
+ /* w2k and w2k3 return 0 and w2k8 returns 1 */
+ if (TARGET_IS_WINXP(tctx) || TARGET_IS_W2K3(tctx)) {
+ CHECK_VALUE(finfo.all_info.out.delete_pending, 0);
+ } else {
+ CHECK_VALUE(finfo.all_info.out.delete_pending, 1);
+ }
smbcli_close(cli->tree, fnum);