s/NT_STATUS_WIN7_INVALID_RANGE/NT_STATUS_INVALID_LOCK_RANGE/g

diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h
index 1608e2874f352e6aea841939581b2f834708a0fc..a97ef5337e20480f489e04bd00f0ca69e21fc708 100644 (file)
--- a/libcli/util/ntstatus.h
+++ b/libcli/util/ntstatus.h
@@ -60,8 +60,8 @@ typedef uint32_t NTSTATUS;
 #define ERROR_INSUFFICIENT_BUFFER        NT_STATUS(0x007a)
 #define ERROR_INVALID_DATATYPE           NT_STATUS(0x070c)
 
-/* XXX Win7 Status code: Name unknown. */
-#define NT_STATUS_WIN7_INVALID_RANGE NT_STATUS(0xC0000000 | 0x01a1)
+/* Win7 status codes. */
+#define NT_STATUS_INVALID_LOCK_RANGE      NT_STATUS(0xC0000000 | 0x01a1)
 
 /* Win32 Error codes extracted using a loop in smbclient then printing a
    netmon sniff to a file. */

diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
index 7f544b59225a6a00faf82e3e52605739eb1bfeea..c19643371049f1a50e3a1d24607b576d8cbb3c0b 100644 (file)
--- a/source4/libcli/util/nterr.c
+++ b/source4/libcli/util/nterr.c
@@ -549,7 +549,7 @@ static const nt_err_code_struct nt_errs[] =
        { "NT_STATUS_OBJECTID_NOT_FOUND", NT_STATUS_OBJECTID_NOT_FOUND },
        { "NT_STATUS_DOWNGRADE_DETECTED", NT_STATUS_DOWNGRADE_DETECTED },
        { "NT_STATUS_DS_BUSY", NT_STATUS_DS_BUSY },
-       { "XXX_INVALID_RANGE", NT_STATUS_WIN7_INVALID_RANGE },
+       { "NT_STATUS_INVALID_LOCK_RANGE", NT_STATUS_INVALID_LOCK_RANGE },
        { "STATUS_MORE_ENTRIES", STATUS_MORE_ENTRIES },
        { "STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED },
        { "STATUS_NOTIFY_CLEANUP", STATUS_NOTIFY_CLEANUP },

diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 72a03e16238b17099733dd6c0430f6497dc9d9a1..7e3ac2980955246c4f1aedcbdbabef3676cfa8f4 100644 (file)
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -364,7 +364,7 @@ static bool test_lockx(struct torture_context *tctx, struct smbcli_state *cli)
        lock[0].count = 2;
        status = smb_raw_lock(cli->tree, &io);
        if (TARGET_IS_WIN7(tctx))
-               CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE);
+               CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE);
        else
                CHECK_STATUS(status, NT_STATUS_OK);
        lock[0].pid--;
@@ -376,7 +376,7 @@ static bool test_lockx(struct torture_context *tctx, struct smbcli_state *cli)
        /* XXX This is very strange - Win7 gives us an invalid range when we
         * unlock the range even though the range is locked! Win7 bug? */
        if (TARGET_IS_WIN7(tctx))
-               CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE);
+               CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE);
        else {
                CHECK_STATUS(status, NT_STATUS_OK);
                status = smb_raw_lock(cli->tree, &io);

diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index 5f0293c6810ecb60cfd973943a55a1c8c843dff2..844309efd4caca5e290ac398488676ed3442a385 100644 (file)
--- 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 {