libcli: Remove NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT error code

This is the same as STATUS_STOPPED_ON_SYMLINK, and this is what also
wireshark displays. Avoid some confusion.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/libcli/util/nterr.c b/libcli/util/nterr.c
index afcb6c4ba139c645079c9dc1aa8e92eb6556eec3..3bca6da1b5551be5a52179016b470e265beaa8e7 100644 (file)
--- a/libcli/util/nterr.c
+++ b/libcli/util/nterr.c
@@ -54,7 +54,6 @@ static const nt_err_code_struct special_errs[] =
         { "NT_STATUS_ERROR_DS_OBJ_STRING_NAME_EXISTS", NT_STATUS_ERROR_DS_OBJ_STRING_NAME_EXISTS },
         { "NT_STATUS_ERROR_DS_INCOMPATIBLE_VERSION", NT_STATUS_ERROR_DS_INCOMPATIBLE_VERSION },
         { "NT_STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP", NT_STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP },
-       { "NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT", NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT },
        { "NT_STATUS_ABIOS_NOT_PRESENT", NT_STATUS_ABIOS_NOT_PRESENT },
        { "NT_STATUS_ABIOS_LID_NOT_EXIST", NT_STATUS_ABIOS_LID_NOT_EXIST },
        { "NT_STATUS_ABIOS_LID_ALREADY_OWNED", NT_STATUS_ABIOS_LID_ALREADY_OWNED },

diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h
index 66cfd11bc5887dd8a3989094983c5cae90ee56b3..6262270472d1909d898049136376a9f62173f78d 100644 (file)
--- a/libcli/util/ntstatus.h
+++ b/libcli/util/ntstatus.h
@@ -56,7 +56,6 @@ typedef uint32_t NTSTATUS;
 #define STATUS_NO_MORE_FILES             NT_STATUS_NO_MORE_FILES
 #define STATUS_INVALID_EA_NAME           NT_STATUS_INVALID_EA_NAME
 #define STATUS_SOME_UNMAPPED             NT_STATUS_SOME_NOT_MAPPED
-#define NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT         NT_STATUS(0x8000002d)
 
 #define NT_STATUS_ABIOS_NOT_PRESENT            NT_STATUS(0xC0000000 | 0x010f)
 #define NT_STATUS_ABIOS_LID_NOT_EXIST          NT_STATUS(0xC0000000 | 0x0110)

diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index cb75878bba3c05864096a066933bc800205e9cc7..f1730065b96f2847b8153e31986bd744fc18768b 100644 (file)
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -76,7 +76,7 @@ int cli_status_to_errno(NTSTATUS status)
                status = dos_to_ntstatus(eclass, ecode);
        }
 
-       if (NT_STATUS_EQUAL(status, NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT)) {
+       if (NT_STATUS_EQUAL(status, NT_STATUS_STOPPED_ON_SYMLINK)) {
                /*
                 * Legacy code from cli_errno, see Samba up to 4.13: A
                 * special case for this Vista error. Since its