summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2002-03-06 18:55:01 +0000
committerHerb Lewis <herb@samba.org>2002-03-06 18:55:01 +0000
commitb9998ace1f75531ea8b7d927c18ad5bd668212ff (patch)
tree9193e780bbfde5f7d6fa5135fb26311a8cf5581a /source3
parent9361708b20483f1090349e51090e7276985cf0be (diff)
downloadsamba-b9998ace1f75531ea8b7d927c18ad5bd668212ff.tar.gz
samba-b9998ace1f75531ea8b7d927c18ad5bd668212ff.tar.bz2
samba-b9998ace1f75531ea8b7d927c18ad5bd668212ff.zip
make error codes match W2k advanced server sp2
(This used to be commit c644ca6a663b615416cd809be4921688f85e84cf)
Diffstat (limited to 'source3')
-rw-r--r--source3/torture/torture.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 3e07de09eb..cb5a951b94 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -805,7 +805,7 @@ static BOOL run_locktest1(int dummy)
return False;
} else {
if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock,
- NT_STATUS_LOCK_NOT_GRANTED)) return False;
+ NT_STATUS_FILE_LOCK_CONFLICT)) return False;
}
t2 = time(NULL);
@@ -823,7 +823,7 @@ static BOOL run_locktest1(int dummy)
return False;
} else {
if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock,
- NT_STATUS_LOCK_NOT_GRANTED)) return False;
+ NT_STATUS_FILE_LOCK_CONFLICT)) return False;
}
if (!cli_close(&cli1, fnum1)) {
@@ -1007,7 +1007,7 @@ static BOOL run_locktest2(int dummy)
correct = False;
} else {
if (!check_error(__LINE__, &cli, ERRDOS, ERRlock,
- NT_STATUS_LOCK_NOT_GRANTED)) return False;
+ NT_STATUS_FILE_LOCK_CONFLICT)) return False;
}
if (!cli_lock(&cli, fnum1, 100, 4, 0, WRITE_LOCK)) {
@@ -1025,7 +1025,7 @@ static BOOL run_locktest2(int dummy)
} else {
if (!check_error(__LINE__, &cli,
ERRDOS, ERRlock,
- NT_STATUS_LOCK_NOT_GRANTED)) return False;
+ NT_STATUS_RANGE_NOT_LOCKED)) return False;
}
if (cli_unlock(&cli, fnum1, 0, 8)) {
@@ -1034,7 +1034,7 @@ static BOOL run_locktest2(int dummy)
} else {
if (!check_error(__LINE__, &cli,
ERRDOS, ERRlock,
- NT_STATUS_LOCK_NOT_GRANTED)) return False;
+ NT_STATUS_RANGE_NOT_LOCKED)) return False;
}
if (cli_lock(&cli, fnum3, 0, 4, 0, WRITE_LOCK)) {