libcli/util: let WERR_UNKNOWN_LEVEL be an alias to WERR_INVALID_LEVEL

WERR_INVALID_LEVEL is the documented name that should be printed
in logs.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index f16db42860e422e3186665db6c465eb6949c3a25..124d4c5801de8d1708921b690ac31e73a8d9e799 100644 (file)
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -46,7 +46,6 @@ static const struct werror_code_struct dos_errs[] =
        { "WERR_BAD_PASSWORD", WERR_BAD_PASSWORD },
        { "WERR_NOMEM", WERR_NOMEM },
        { "WERR_INVALID_NAME", WERR_INVALID_NAME },
-       { "WERR_UNKNOWN_LEVEL", WERR_UNKNOWN_LEVEL },
        { "WERR_OBJECT_PATH_INVALID", WERR_OBJECT_PATH_INVALID },
        { "WERR_ALREADY_EXISTS", WERR_ALREADY_EXISTS },
        { "WERR_NO_MORE_ITEMS", WERR_NO_MORE_ITEMS },

diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index 4c14b7f2b20cc764115b51590be6f46be7347b94..7e13f5da9496e1311ddf711c9b70bbda5cae9843 100644 (file)
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -104,7 +104,6 @@ typedef uint32_t WERROR;
 #define WERR_SEM_TIMEOUT W_ERROR(0x00000079)
 #define WERR_INSUFFICIENT_BUFFER W_ERROR(0x0000007A)
 #define WERR_INVALID_NAME W_ERROR(0x0000007B)
-#define WERR_UNKNOWN_LEVEL W_ERROR(0x0000007C)
 #define WERR_OBJECT_PATH_INVALID W_ERROR(0x000000A1)
 #define WERR_ALREADY_EXISTS W_ERROR(0x000000B7)
 #define WERR_MORE_DATA W_ERROR(0x000000EA)
@@ -261,6 +260,9 @@ typedef uint32_t WERROR;
 /* Generic error code aliases */
 #define WERR_FOOBAR WERR_GENERAL_FAILURE
 
+/* TODO: remove WERR_UNKNOWN_LEVEL in all callers */
+#define WERR_UNKNOWN_LEVEL WERR_INVALID_LEVEL
+
 /*****************************************************************************
  Auto-generated Win32 error from:
  http://msdn.microsoft.com/en-us/library/cc231199%28PROT.10%29.aspx