diff options
author | Andrew Bartlett <abartlet@samba.org> | 2009-04-03 08:28:22 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-03 08:28:22 +1100 |
commit | 2f04b7d29a9e93152ff40a04afa50d3755ff0a25 (patch) | |
tree | ccef6bba0937d61bd461335e510db9813b5c24ce /source4/torture/smb2/lock.c | |
parent | 354ba5e2e35c0adb2dd04f81a6ce7d1d721f31dc (diff) | |
parent | 31ab1d6a6487fb442ccd5b2cd093b4a2b7b80291 (diff) | |
download | samba-2f04b7d29a9e93152ff40a04afa50d3755ff0a25.tar.gz samba-2f04b7d29a9e93152ff40a04afa50d3755ff0a25.tar.bz2 samba-2f04b7d29a9e93152ff40a04afa50d3755ff0a25.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source4/torture/smb2/lock.c')
-rw-r--r-- | source4/torture/smb2/lock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c index 5f0293c681..844309efd4 100644 --- a/source4/torture/smb2/lock.c +++ b/source4/torture/smb2/lock.c @@ -101,7 +101,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree el[0].flags = SMB2_LOCK_FLAG_EXCLUSIVE|SMB2_LOCK_FLAG_FAIL_IMMEDIATELY; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else { CHECK_STATUS(status, NT_STATUS_OK); } @@ -110,7 +110,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree lck.in.reserved = 0x123ab2; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else { CHECK_STATUS(status, NT_STATUS_OK); } @@ -118,7 +118,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree lck.in.reserved = 0x123ab3; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else if (TARGET_IS_WINDOWS(torture)) { CHECK_STATUS(status, NT_STATUS_OK); } else { @@ -129,7 +129,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree lck.in.reserved = 0x123ab4; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else { CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED); } @@ -137,7 +137,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree lck.in.reserved = 0x123ab5; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else if (TARGET_IS_WINDOWS(torture)) { CHECK_STATUS(status, NT_STATUS_OK); } else { |