[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-911-g1f6646e

[Günther Deschner]

The branch, master has been updated
       via  1f6646e1351b00c55498fcfb809e9762f4d67c22 (commit)
      from  fa7f2ffe5116dce69e89b990f816a32721474fb6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1f6646e1351b00c55498fcfb809e9762f4d67c22
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 8 13:49:14 2009 +0200

    s4-smbtorture: Small fix for RPC-SPOOLSS-WIN to deal with driver-less printers.
    
    The getdriver query failure should only be critical when there is actually a
    driver associated to a printer.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/rpc/spoolss_win.c |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index c50cbfb..42b6929 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -34,6 +34,8 @@ struct test_spoolss_win_context {
 
 	/* EnumPrinterKeys */
 	const char **printer_keys;
+
+	bool printer_has_driver;
 };
 
 /* This is a convenience function for all OpenPrinterEx calls */
@@ -256,6 +258,12 @@ static bool test_GetPrinter(struct torture_context *tctx,
 	torture_assert_werr_ok(tctx, gp.out.result, "GetPrinter failed");
 
 	ctx->current_info = gp.out.info;
+
+	if (level == 2 && gp.out.info) {
+		ctx->printer_has_driver = gp.out.info->info2.drivername &&
+					  strlen(gp.out.info->info2.drivername);
+	}
+
 	return true;
 }
 
@@ -289,6 +297,7 @@ static bool test_EnumJobs(struct torture_context *tctx,
 
 static bool test_GetPrinterDriver2(struct torture_context *tctx,
 					struct dcerpc_pipe *p,
+					struct test_spoolss_win_context *ctx,
 					struct policy_handle *handle)
 {
 	NTSTATUS status;
@@ -313,8 +322,11 @@ static bool test_GetPrinterDriver2(struct torture_context *tctx,
 
 	status = dcerpc_spoolss_GetPrinterDriver2(p, tctx, &gpd2);
 	torture_assert_ntstatus_ok(tctx, status, "GetPrinterDriver2 failed");
-	torture_assert_werr_ok(tctx, gpd2.out.result,
-			"GetPrinterDriver2 failed.");
+
+	if (ctx->printer_has_driver) {
+		torture_assert_werr_ok(tctx, gpd2.out.result,
+				"GetPrinterDriver2 failed.");
+	}
 
 	return true;
 }
@@ -527,7 +539,7 @@ static bool test_WinXP(struct torture_context *tctx, struct dcerpc_pipe *p)
 	ret &= test_ClosePrinter(tctx, p, &handle04);
 
 	ret &= test_EnumPrinters(tctx, p, ctx, 1556);
-	ret &= test_GetPrinterDriver2(tctx, p, &handle03);
+	ret &= test_GetPrinterDriver2(tctx, p, ctx, &handle03);
 	ret &= test_EnumForms(tctx, p, &handle03, 0);
 
 	ret &= test_EnumPrinterKey(tctx, p, &handle03, "", ctx);


-- 
Samba Shared Repository