From: Günther Deschner Date: Wed, 9 Dec 2015 14:55:59 +0000 (+0100) Subject: werror: replace WERR_SEC_E_DECRYPT_FAILURE with HRES_SEC_E_DECRYPT_FAILURE X-Git-Tag: tevent-0.9.31~86 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=d013dc4af166a597ab23ceb8b944524709c694d3 werror: replace WERR_SEC_E_DECRYPT_FAILURE with HRES_SEC_E_DECRYPT_FAILURE Guenther Signed-off-by: Guenther Deschner Reviewed-by: Jeremy Allison --- diff --git a/libcli/drsuapi/repl_decrypt.c b/libcli/drsuapi/repl_decrypt.c index 275dac4a108..c370f2e3bf5 100644 --- 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) { - 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 diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c index b66d7dba85f..7d03ea5e017 100644 --- 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_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 }, /***************************************************************************** diff --git a/libcli/util/werror.h b/libcli/util/werror.h index d5cdd11ffee..f0add35d70d 100644 --- 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_SEC_E_DECRYPT_FAILURE W_ERROR(0x80090330) #define WERR_SEC_E_ALGORITHM_MISMATCH W_ERROR(0x80090331) /* Generic error code aliases */