From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 9 Oct 2006 14:33:56 +0000 (+0000)
Subject: r19205: Some consolidation
X-Git-Tag: samba-4.0.0alpha6~801^3~4533
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ead8b391d9a1b20f2d06cf003a622fd913045e8;p=thirdparty%2Fsamba.git

r19205: Some consolidation
(This used to be commit 6991864a032b136c68190b0f86714cd6c0c14b9f)
---

diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index e10a9b54b7c..24799d2a169 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -2369,7 +2369,6 @@ static NTSTATUS getprinterinfo(TALLOC_CTX *ctx, struct dcerpc_pipe *pipe,
 	talloc_free(mem_ctx);
 	return NT_STATUS_OK;
 }
-	
 
 BOOL torture_samba3_rpc_spoolss(struct torture_context *torture)
 {
@@ -2447,15 +2446,9 @@ BOOL torture_samba3_rpc_spoolss(struct torture_context *torture)
 		r.out.handle = &server_handle;
 
 		status = dcerpc_spoolss_OpenPrinterEx(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
+		if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
 			d_printf("(%s) dcerpc_spoolss_OpenPrinterEx failed: "
-				 "%s\n", __location__, nt_errstr(status));
-			talloc_free(mem_ctx);
-			return False;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
-			d_printf("(%s) dcerpc_spoolss_OpenPrinterEx failed: "
-				 "%s\n", __location__,
+				 "%s, %s\n", __location__, nt_errstr(status),
 				 win_errstr(r.out.result));
 			talloc_free(mem_ctx);
 			return False;
@@ -2469,15 +2462,9 @@ BOOL torture_samba3_rpc_spoolss(struct torture_context *torture)
 		r.out.handle = &server_handle;
 
 		status = dcerpc_spoolss_ClosePrinter(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("(%s) dcerpc_spoolss_ClosePrinter failed: "
-				 "%s\n", __location__, nt_errstr(status));
-			talloc_free(mem_ctx);
-			return False;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
+		if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
 			d_printf("(%s) dcerpc_spoolss_ClosePrinter failed: "
-				 "%s\n", __location__,
+				 "%s, %s\n", __location__, nt_errstr(status),
 				 win_errstr(r.out.result));
 			talloc_free(mem_ctx);
 			return False;
@@ -2497,15 +2484,9 @@ BOOL torture_samba3_rpc_spoolss(struct torture_context *torture)
 		r.out.handle = &printer_handle;
 
 		status = dcerpc_spoolss_OpenPrinterEx(p, mem_ctx, &r);
-		if (!NT_STATUS_IS_OK(status)) {
-			d_printf("(%s) dcerpc_spoolss_OpenPrinterEx failed: "
-				 "%s\n", __location__, nt_errstr(status));
-			talloc_free(mem_ctx);
-			return False;
-		}
-		if (!W_ERROR_IS_OK(r.out.result)) {
+		if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
 			d_printf("(%s) dcerpc_spoolss_OpenPrinterEx failed: "
-				 "%s\n", __location__,
+				 "%s, %s\n", __location__, nt_errstr(status),
 				 win_errstr(r.out.result));
 			talloc_free(mem_ctx);
 			return False;