1 files changed, 42 insertions, 20 deletions

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index d17b3c7b60..bfe667240c 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -313,7 +313,11 @@ static bool test_EnumPrinterDrivers(struct torture_context *tctx,
 		uint32_t count;
 		union spoolss_DriverInfo *info;
 
-		r.in.server		= "";
+		/* FIXME: gd, come back and fix "" as server, and handle
+		 * priority of returned error codes in torture test and samba 3
+		 * server */
+
+		r.in.server		= talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 		r.in.environment	= SPOOLSS_ARCHITECTURE_NT_X86;
 		r.in.level		= level;
 		r.in.buffer		= NULL;
@@ -331,16 +335,15 @@ static bool test_EnumPrinterDrivers(struct torture_context *tctx,
 			/* TODO: do some more checks here */
 			continue;
 		}
-		torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, 
-			"EnumPrinterDrivers failed");
-
-		blob = data_blob_talloc(ctx, NULL, needed);
-		data_blob_clear(&blob);
-		r.in.buffer = &blob;
-		r.in.offered = needed;
+		if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+			blob = data_blob_talloc(ctx, NULL, needed);
+			data_blob_clear(&blob);
+			r.in.buffer = &blob;
+			r.in.offered = needed;
 
-		status = dcerpc_spoolss_EnumPrinterDrivers(p, ctx, &r);
-		torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrinterDrivers failed");
+			status = dcerpc_spoolss_EnumPrinterDrivers(p, ctx, &r);
+			torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrinterDrivers failed");
+		}
 
 		torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDrivers failed");
 
@@ -1061,28 +1064,43 @@ static bool test_GetJob(struct torture_context *tctx,
 	NTSTATUS status;
 	struct spoolss_GetJob r;
 	uint32_t needed;
+	uint32_t levels[] = {1, 2 /* 3, 4 */};
+	uint32_t i;
 
 	r.in.handle = handle;
 	r.in.job_id = job_id;
-	r.in.level = 1;
+	r.in.level = 0;
 	r.in.buffer = NULL;
 	r.in.offered = 0;
 	r.out.needed = &needed;
 
-	torture_comment(tctx, "Testing GetJob\n");
+	torture_comment(tctx, "Testing GetJob level %d\n", r.in.level);
 
 	status = dcerpc_spoolss_GetJob(p, tctx, &r);
-	torture_assert_ntstatus_ok(tctx, status, "GetJob failed");
+	torture_assert_werr_equal(tctx, r.out.result, WERR_UNKNOWN_LEVEL, "Unexpected return code");
 
-	if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
-		DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
-		data_blob_clear(&blob);
-		r.in.buffer = &blob;
-		r.in.offered = needed;
+	for (i = 0; i < ARRAY_SIZE(levels); i++) {
+
+		torture_comment(tctx, "Testing GetJob level %d\n", r.in.level);
+
+		r.in.level = levels[i];
+		r.in.offered = 0;
 
 		status = dcerpc_spoolss_GetJob(p, tctx, &r);
+		torture_assert_ntstatus_ok(tctx, status, "GetJob failed");
 
+		if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+			DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+			data_blob_clear(&blob);
+			r.in.buffer = &blob;
+			r.in.offered = needed;
+
+			status = dcerpc_spoolss_GetJob(p, tctx, &r);
+			torture_assert_ntstatus_ok(tctx, status, "GetJob failed");
+
+		}
 		torture_assert(tctx, r.out.info, "No job info returned");
+		torture_assert_werr_ok(tctx, r.out.result, "GetJob failed");
 	}
 
 	return true;
@@ -1209,8 +1227,12 @@ static bool test_EnumJobs(struct torture_context *tctx,
 		for (j = 0; j < count; j++) {
 
 			test_GetJob(tctx, p, handle, info[j].info1.job_id);
-			test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_PAUSE);
-			test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_RESUME);
+
+			/* FIXME - gd */
+			if (!torture_setting_bool(tctx, "samba3", false)) {
+				test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_PAUSE);
+				test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_RESUME);
+			}
 		}
 
 	} else {