werror: replace WERR_SEC_E_DECRYPT_FAILURE with HRES_SEC_E_DECRYPT_FAILURE

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/libcli/drsuapi/repl_decrypt.c b/libcli/drsuapi/repl_decrypt.c
index 275dac4a108009f3081fd174b652ff0d7a9bdaa5..c370f2e3bf597ecfc4fc8f487394db8f217fd1d7 100644 (file)
--- a/libcli/drsuapi/repl_decrypt.c
+++ b/libcli/drsuapi/repl_decrypt.c
@@ -101,7 +101,7 @@ WERROR drsuapi_decrypt_attribute_value(TALLOC_CTX *mem_ctx,
        W_ERROR_HAVE_NO_MEMORY(plain_buffer.data);
 
        if (crc32_given != crc32_calc) {
        W_ERROR_HAVE_NO_MEMORY(plain_buffer.data);
 
        if (crc32_given != crc32_calc) {

-               return WERR_SEC_E_DECRYPT_FAILURE;
+               return W_ERROR(HRES_ERROR_V(HRES_SEC_E_DECRYPT_FAILURE));

        }
        /*
         * The following rid_crypt obfuscation isn't session specific
        }
        /*
         * The following rid_crypt obfuscation isn't session specific

diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index b66d7dba85fa3ba078b01825c85a2eb2f769c84d..7d03ea5e017c882d14b12a14d0c6eed36173c257 100644 (file)
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -125,7 +125,6 @@ static const struct werror_code_struct dos_errs[] =
        { "WERR_DNS_ERROR_DP_ALREADY_ENLISTED", WERR_DNS_ERROR_DP_ALREADY_ENLISTED },
        { "WERR_DNS_ERROR_DP_NOT_AVAILABLE", WERR_DNS_ERROR_DP_NOT_AVAILABLE },
        { "WERR_DNS_ERROR_DP_FSMO_ERROR", WERR_DNS_ERROR_DP_FSMO_ERROR },
        { "WERR_DNS_ERROR_DP_ALREADY_ENLISTED", WERR_DNS_ERROR_DP_ALREADY_ENLISTED },
        { "WERR_DNS_ERROR_DP_NOT_AVAILABLE", WERR_DNS_ERROR_DP_NOT_AVAILABLE },
        { "WERR_DNS_ERROR_DP_FSMO_ERROR", WERR_DNS_ERROR_DP_FSMO_ERROR },

-       { "WERR_SEC_E_DECRYPT_FAILURE", WERR_SEC_E_DECRYPT_FAILURE },

        { "WERR_SEC_E_ALGORITHM_MISMATCH", WERR_SEC_E_ALGORITHM_MISMATCH },
        { "WERR_RPC_E_REMOTE_DISABLED", WERR_RPC_E_REMOTE_DISABLED },
        /*****************************************************************************
        { "WERR_SEC_E_ALGORITHM_MISMATCH", WERR_SEC_E_ALGORITHM_MISMATCH },
        { "WERR_RPC_E_REMOTE_DISABLED", WERR_RPC_E_REMOTE_DISABLED },
        /*****************************************************************************

diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index d5cdd11ffee710e939da1cf4017be3ad0e0c9ded..f0add35d70dd94f24a953c6f8c57bc30fe9b883c 100644 (file)
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -107,7 +107,6 @@ typedef uint32_t WERROR;
 #define WERR_RPC_E_REMOTE_DISABLED     W_ERROR(0x8001011c)
 
 /* SEC errors */
 #define WERR_RPC_E_REMOTE_DISABLED     W_ERROR(0x8001011c)
 
 /* SEC errors */

-#define WERR_SEC_E_DECRYPT_FAILURE     W_ERROR(0x80090330)

 #define WERR_SEC_E_ALGORITHM_MISMATCH  W_ERROR(0x80090331)
 
 /* Generic error code aliases */
 #define WERR_SEC_E_ALGORITHM_MISMATCH  W_ERROR(0x80090331)
 
 /* Generic error code aliases */