diff options
| author | Jeremy Allison <jra@samba.org> | 2015-10-20 12:31:03 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-10-28 12:41:22 +0100 |
| commit | a915f8f6c80d726499c1e1a83f7108bf23ab0bd2 (patch) | |
| tree | 399f3fe0d98afd1394407a3935ef3aa682d667a7 /source4/torture | |
| parent | 7c535ad0fb471eef8e56f7a53f8e8fca48ad840c (diff) | |
| download | samba-a915f8f6c80d726499c1e1a83f7108bf23ab0bd2.tar.gz | |
s3-torture: Remove (incorrect) samba3-specific behavior in samba3.raw.unlink now the server is correct
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11452
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit e4054f211872168ac4cf022e2d961e8979610920)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/raw/unlink.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c index 25edb5e045d..4f198fa2759 100644 --- a/source4/torture/raw/unlink.c +++ b/source4/torture/raw/unlink.c @@ -178,12 +178,7 @@ static bool test_unlink(struct torture_context *tctx, struct smbcli_state *cli) io.unlink.in.pattern = BASEDIR "\\*.tx?"; io.unlink.in.attrib = 0; status = smb_raw_unlink(cli->tree, &io); - if (torture_setting_bool(tctx, "samba3", false)) { - CHECK_STATUS(status, NT_STATUS_NO_SUCH_FILE); - } - else { - CHECK_STATUS(status, NT_STATUS_OK); - } + CHECK_STATUS(status, NT_STATUS_OK); status = smb_raw_unlink(cli->tree, &io); CHECK_STATUS(status, NT_STATUS_NO_SUCH_FILE); |