From ec094bf9ac144daf3bad31e71d6bee9849e0149a Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 23 Jan 2012 12:18:01 -0800 Subject: [PATCH] WERROR type variable being incorrectly checked with a NT_STATUS_IS_X type macro. --- source3/printing/nt_printing.c | 2 +- source3/rpc_client/cli_winreg_spoolss.c | 2 +- source4/lib/registry/tools/regtree.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 70346b24edc..7fc55c3098b 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -746,7 +746,7 @@ static uint32 get_correct_cversion(struct auth_session_info *session_info, SMB_VFS_DISCONNECT(conn); conn_free(conn); } - if (!NT_STATUS_IS_OK(*perr)) { + if (!W_ERROR_IS_OK(*perr)) { cversion = -1; } diff --git a/source3/rpc_client/cli_winreg_spoolss.c b/source3/rpc_client/cli_winreg_spoolss.c index 2a6a8d1986f..a50fcc7ca0e 100644 --- a/source3/rpc_client/cli_winreg_spoolss.c +++ b/source3/rpc_client/cli_winreg_spoolss.c @@ -3647,7 +3647,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, result = winreg_enumval_to_dword(info8, v, "Version", &tmp); - if (NT_STATUS_IS_OK(result)) { + if (W_ERROR_IS_OK(result)) { info8->version = (enum spoolss_DriverOSVersion) tmp; } CHECK_ERROR(result); diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c index 68579406722..40570dd778a 100644 --- a/source4/lib/registry/tools/regtree.c +++ b/source4/lib/registry/tools/regtree.c @@ -92,7 +92,7 @@ static void print_tree(unsigned int level, struct registry_key *p, } mem_ctx = talloc_init("sec_desc"); - if (NT_STATUS_IS_ERR(reg_get_sec_desc(mem_ctx, p, &sec_desc))) { + if (!W_ERROR_IS_OK(reg_get_sec_desc(mem_ctx, p, &sec_desc))) { DEBUG(0, ("Error getting security descriptor\n")); } talloc_free(mem_ctx); -- 2.34.1