svn commit: samba r19205 - in branches/SAMBA_4_0/source/torture/rpc: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-10-09 14:33:56 +0000 (Mon, 09 Oct 2006)
New Revision: 19205

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19205

Log:
Some consolidation
Modified:
   branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c	2006-10-09 14:06:13 UTC (rev 19204)
+++ branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c	2006-10-09 14:33:56 UTC (rev 19205)
@@ -2369,7 +2369,6 @@
 	talloc_free(mem_ctx);
 	return NT_STATUS_OK;
 }
-	
 
 BOOL torture_samba3_rpc_spoolss(struct torture_context *torture)
 {
@@ -2447,15 +2446,9 @@
 		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 @@
 		r.out.handle = &server_handle;
 
 		status = dcerpc_spoolss_ClosePrinter(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_ClosePrinter 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_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 @@
 		r.out.handle = &printer_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;