From: David Disseldorp <ddiss@samba.org>
Date: Mon, 23 Jan 2012 20:18:01 +0000 (-0800)
Subject: WERROR type variable being incorrectly checked with a NT_STATUS_IS_X
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=ec094bf9ac144daf3bad31e71d6bee9849e0149a;p=metze%2Fsamba%2Fwip.git

WERROR type variable being incorrectly checked with a NT_STATUS_IS_X
type macro.
---

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 70346b24edc5..7fc55c3098b7 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 2a6a8d1986f6..a50fcc7ca0e9 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 68579406722d..40570dd778a1 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);