1 files changed, 161 insertions, 75 deletions

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 0f104491b6..c44c2a1db8 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -21,23 +21,102 @@
 
 #include "includes.h"
 
+BOOL test_GetPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+		     struct policy_handle *handle)
+{
+	NTSTATUS status;
+	struct spoolss_GetPrinter r;
+	uint32 buf_size = 0;
+	DATA_BLOB blob;
+	union spoolss_PrinterInfo info;
+	uint16 levels[] = {1, 2, 3, 4, 5, 6, 7};
+	int i;
+	BOOL ret = True;
+	
+	for (i=0;i<ARRAY_SIZE(levels);i++) {
+		r.in.handle = handle;
+		r.in.level = levels[i];
+		r.in.buffer = NULL;
+		r.in.buf_size = &buf_size;
+		r.out.buf_size = &buf_size;
+
+		printf("Testing GetPrinter level %u\n", r.in.level);
+
+		status = dcerpc_spoolss_GetPrinter(p, mem_ctx, &r);
+		if (!NT_STATUS_IS_OK(status)) {
+			printf("GetPrinter failed - %s\n", nt_errstr(status));
+			ret = False;
+			continue;
+		}
+		
+		if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+			blob = data_blob_talloc(mem_ctx, NULL, buf_size);
+			data_blob_clear(&blob);
+			r.in.buffer = &blob;
+			status = dcerpc_spoolss_GetPrinter(p, mem_ctx, &r);
+		}
+		
+		if (!NT_STATUS_IS_OK(status) ||
+		    !W_ERROR_IS_OK(r.out.result)) {
+			printf("GetPrinter failed - %s/%s\n", 
+			       nt_errstr(status), win_errstr(r.out.result));
+			ret = False;
+			continue;
+		}
+		
+		status = ndr_pull_union_blob(r.out.buffer, mem_ctx, r.in.level, &info,
+					     (ndr_pull_union_fn_t)ndr_pull_spoolss_PrinterInfo);
+		if (!NT_STATUS_IS_OK(status)) {
+			printf("PrinterInfo parse failed - %s\n", nt_errstr(status));
+			ret = False;
+			continue;
+		}
+		
+		NDR_PRINT_UNION_DEBUG(spoolss_PrinterInfo, r.in.level, &info);
+	}
+
+	return ret;
+}
+
+
+BOOL test_ClosePrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+		       struct policy_handle *handle)
+{
+	NTSTATUS status;
+	struct spoolss_ClosePrinter r;
+
+	r.in.handle = handle;
+	r.out.handle = handle;
+
+	printf("Testing ClosePrinter\n");
+
+	status = dcerpc_spoolss_ClosePrinter(p, mem_ctx, &r);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("ClosePrinter failed - %s\n", nt_errstr(status));
+		return False;
+	}
+
+	return True;
+}
+
 static BOOL test_OpenPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			     struct spoolss_PrinterInfo1 *info1)
+			     const char *name)
 {
 	NTSTATUS status;
 	struct spoolss_OpenPrinter r;
 	struct policy_handle handle;
 	DATA_BLOB blob;
+	BOOL ret = True;
 
 	blob = data_blob(NULL, 0);
 
 	r.in.server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-	r.in.printer = info1->name;
+	r.in.printer = name;
 	r.in.buffer = &blob;
-	r.in.access_mask = SEC_RIGHT_MAXIMUM_ALLOWED;	
+	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;	
 	r.out.handle = &handle;
 
-	printf("Testing OpenPrinter(\\\\%s\\%s)\n", r.in.server, r.in.printer);
+	printf("\nTesting OpenPrinter(\\\\%s\\%s)\n", r.in.server, r.in.printer);
 
 	status = dcerpc_spoolss_OpenPrinter(p, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
@@ -46,10 +125,71 @@ static BOOL test_OpenPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		return False;
 	}
 
+
+	if (!test_GetPrinter(p, mem_ctx, &handle)) {
+		ret = False;
+	}
+
+	if (!test_ClosePrinter(p, mem_ctx, &handle)) {
+		ret = False;
+	}
 	
-	return True;
+	return ret;
+}
+
+static BOOL test_OpenPrinterEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+			       const char *name)
+{
+	struct policy_handle handle;
+	struct spoolss_OpenPrinterEx r;
+	struct spoolss_UserLevel1 userlevel1;
+	NTSTATUS status;
+	BOOL ret = True;
+
+	r.in.printername = talloc_asprintf(mem_ctx, "\\\\%s\\%s", 
+					   dcerpc_server_name(p), name);
+	r.in.datatype = NULL;
+	r.in.devmode_ctr.size = 0;
+	r.in.devmode_ctr.devmode = NULL;
+	r.in.access_required = 0x02000000;
+	r.in.level = 1;
+	r.out.handle = &handle;
+
+	userlevel1.size = 1234;
+	userlevel1.client = "hello";
+	userlevel1.user = "spottyfoot!";
+	userlevel1.build = 1;
+	userlevel1.major = 2;
+	userlevel1.minor = 3;
+	userlevel1.processor = 4;
+	r.in.userlevel.level1 = &userlevel1;
+
+	printf("Testing OpenPrinterEx(%s)\n", r.in.printername);
+
+	status = dcerpc_spoolss_OpenPrinterEx(p, mem_ctx, &r);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("OpenPrinterEx failed - %s\n", nt_errstr(status));
+		return False;
+	}
+
+	if (!W_ERROR_IS_OK(r.out.result)) {
+		printf("OpenPrinterEx failed - %s\n", win_errstr(r.out.result));
+		return False;
+	}
+
+	if (!test_GetPrinter(p, mem_ctx, &handle)) {
+		ret = False;
+	}
+
+	if (!test_ClosePrinter(p, mem_ctx, &handle)) {
+		ret = False;
+	}
+
+	return ret;
 }
 
+
 static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
 	struct spoolss_EnumPrinters r;
@@ -60,7 +200,7 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		uint32 buf_size = 0;
-		union spoolss_PrinterEnum *info;
+		union spoolss_PrinterInfo *info;
 		int j;
 
 		r.in.flags = 0x02;
@@ -73,7 +213,7 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 		printf("\nTesting EnumPrinters level %u\n", r.in.level);
 
 		status = dcerpc_spoolss_EnumPrinters(p, mem_ctx, &r);
-		if (NT_STATUS_IS_ERR(status)) {
+		if (!NT_STATUS_IS_OK(status)) {
 			printf("EnumPrinters failed - %s\n", nt_errstr(status));
 			ret = False;
 			continue;
@@ -93,7 +233,7 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 			continue;
 		}
 
-		status = pull_spoolss_PrinterEnumArray(r.out.buffer, mem_ctx, r.in.level, r.out.count, &info);
+		status = pull_spoolss_PrinterInfoArray(r.out.buffer, mem_ctx, r.in.level, r.out.count, &info);
 		if (!NT_STATUS_IS_OK(status)) {
 			printf("EnumPrintersArray parse failed - %s\n", nt_errstr(status));
 			continue;
@@ -101,13 +241,22 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 		for (j=0;j<r.out.count;j++) {
 			printf("Printer %d\n", j);
-			NDR_PRINT_UNION_DEBUG(spoolss_PrinterEnum, r.in.level, &info[j]);
+			NDR_PRINT_UNION_DEBUG(spoolss_PrinterInfo, r.in.level, &info[j]);
 		}
 
 		for (j=0;j<r.out.count;j++) {
-			if (r.in.level == 1 &&
-			    !test_OpenPrinter(p, mem_ctx, &info[j].info1)) {
-				ret = False;
+			if (r.in.level == 1) {
+				/* the names appear to be comma-separated name lists? */
+				char *name = talloc_strdup(mem_ctx, info[j].info1.name);
+				char *comma = strchr(name, ',');
+				if (comma) *comma = 0;
+				if (!test_OpenPrinter(p, mem_ctx, name)) {
+					ret = False;
+				}
+
+				if (!test_OpenPrinterEx(p, mem_ctx, name)) {
+					ret = False;
+				}
 			}
 		}
 	}
@@ -115,67 +264,12 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	return ret;
 }
 
-static BOOL test_OpenPrinterEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle)
-{
-	struct spoolss_OpenPrinterEx r;
-	struct spoolss_UserLevel1 userlevel1;
-	NTSTATUS status;
-
-	r.in.printername = "\\\\movingforward\\p";
-	r.in.datatype = NULL;
-	r.in.devmode_ctr.size = 0;
-	r.in.devmode_ctr.devmode = NULL;
-	r.in.access_required = 0x02000000;
-	r.in.level = 1;
-	r.out.handle = handle;
-
-	userlevel1.size = 1234;
-	userlevel1.client = "hello";
-	userlevel1.user = "spottyfoot!";
-	userlevel1.build = 1;
-	userlevel1.major = 2;
-	userlevel1.minor = 3;
-	userlevel1.processor = 4;
-	r.in.userlevel.level1 = &userlevel1;
-
-	status = dcerpc_spoolss_OpenPrinterEx(p, mem_ctx, &r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("OpenPrinter failed - %s\n", nt_errstr(status));
-		return False;
-	}
-
-	return True;
-}
-
-static BOOL test_ClosePrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			      struct policy_handle *handle)
-{
-	struct spoolss_ClosePrinter r;
-	struct policy_handle handle2;
-	NTSTATUS status;
-
-	r.in.handle = handle;
-	r.out.handle = &handle2;
-
-	status = dcerpc_spoolss_ClosePrinter(p, mem_ctx, &r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("ClosePrinter failed - %s\n", nt_errstr(status));
-		return False;
-	}
-
-	return True;
-}
-
 BOOL torture_rpc_spoolss(int dummy)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
-	struct policy_handle handle;
 
 	mem_ctx = talloc_init("torture_rpc_spoolss");
 
@@ -188,14 +282,6 @@ BOOL torture_rpc_spoolss(int dummy)
 		ret = False;
 	}
 
-	if (!test_OpenPrinterEx(p, mem_ctx, &handle)) {
-		ret = False;
-	}
-
-	if (!test_ClosePrinter(p, mem_ctx, &handle)) {
-		ret = False;
-	}
-
         torture_rpc_close(p);
 
 	return ret;