[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Feb 16 01:22:33 MST 2010
The branch, master has been updated
via 41bb876... s4-smbtorture: more work on test_PrinterInfo_DevMode RPC-SPOOLSS-PRINTER.
via 1e59e5d... s4-smbtorture: allow to call OpenPrinterEx with devicemode.
from 351f694... testprogs: add "samba3" and "architecture=" options to spoolss tester.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 41bb8767a2440d3c6db76c1547c988f4adabe5b9
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 16 03:28:43 2010 +0100
s4-smbtorture: more work on test_PrinterInfo_DevMode RPC-SPOOLSS-PRINTER.
Guenther
commit 1e59e5d8c91ed4daedac7ea80fd0daa9d946b5e4
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 16 03:26:10 2010 +0100
s4-smbtorture: allow to call OpenPrinterEx with devicemode.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/spoolss.c | 104 +++++++++++++++++++++++++++++++++++++---
1 files changed, 96 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 05eee62..54101e7 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -1814,13 +1814,27 @@ static bool test_devicemode_equal(struct torture_context *tctx,
return true;
}
+static bool call_OpenPrinterEx(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ const char *name,
+ struct spoolss_DeviceMode *devmode,
+ struct policy_handle *handle);
+
+static bool test_ClosePrinter(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle);
+
static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
struct dcerpc_pipe *p,
- struct policy_handle *handle)
+ struct policy_handle *handle,
+ const char *name)
{
union spoolss_PrinterInfo info;
struct spoolss_DeviceMode *devmode;
struct spoolss_DeviceMode *devmode2;
+ struct policy_handle handle_devmode;
+
+ /* simply compare level8 and level2 devmode */
torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 8, &info), "");
@@ -1832,6 +1846,77 @@ static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
torture_assert(tctx, test_devicemode_equal(tctx, devmode, devmode2), "");
+
+ /* change formname upon open and see if it persists in getprinter calls */
+
+ devmode->formname = talloc_strdup(tctx, "A4");
+
+ torture_assert(tctx, call_OpenPrinterEx(tctx, p, name, devmode, &handle_devmode),
+ "failed to open printer handle");
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, &handle_devmode, 8, &info), "");
+
+ devmode2 = info.info8.devmode;
+
+ if (strequal(devmode->devicename, devmode2->devicename)) {
+ torture_fail(tctx, "devicename is the same");
+ }
+
+ if (strequal(devmode->formname, devmode2->formname)) {
+ torture_fail(tctx, "formname is the same");
+ }
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, &handle_devmode, 2, &info), "");
+
+ devmode2 = info.info2.devmode;
+
+ if (strequal(devmode->devicename, devmode2->devicename)) {
+ torture_fail(tctx, "devicename is the same");
+ }
+
+ if (strequal(devmode->formname, devmode2->formname)) {
+ torture_fail(tctx, "formname is the same");
+ }
+
+ test_ClosePrinter(tctx, p, &handle_devmode);
+
+
+ /* set devicemode and see if it persists */
+
+ devmode->copies = 93;
+ devmode->formname = talloc_strdup(tctx, "Legal");
+
+ {
+ struct spoolss_SetPrinterInfoCtr info_ctr;
+ struct spoolss_SetPrinterInfo8 info8;
+ struct spoolss_DevmodeContainer devmode_ctr;
+ struct sec_desc_buf secdesc_ctr;
+
+ info8.devmode_ptr = 0;
+
+ info_ctr.level = 8;
+ info_ctr.info.info8 = &info8;
+
+ devmode_ctr.devmode = devmode;
+
+ ZERO_STRUCT(secdesc_ctr);
+
+ torture_assert(tctx,
+ test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr, &secdesc_ctr, 0), "");
+ }
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 8, &info), "");
+
+ devmode2 = info.info8.devmode;
+
+ torture_assert(tctx, test_devicemode_equal(tctx, devmode, devmode2), "");
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info), "");
+
+ devmode2 = info.info2.devmode;
+
+ torture_assert(tctx, test_devicemode_equal(tctx, devmode, devmode2), "");
+
return true;
}
@@ -1841,7 +1926,8 @@ static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
static bool test_PrinterInfo_DevMode(struct torture_context *tctx,
struct dcerpc_pipe *p,
- struct policy_handle *handle)
+ struct policy_handle *handle,
+ const char *name)
{
union spoolss_PrinterInfo info;
struct spoolss_SetPrinterInfo8 info8;
@@ -1859,7 +1945,7 @@ static bool test_PrinterInfo_DevMode(struct torture_context *tctx,
/* run tests */
- ret = test_PrinterInfo_DevModes(tctx, p, handle);
+ ret = test_PrinterInfo_DevModes(tctx, p, handle, name);
/* restore original devmode */
@@ -3337,7 +3423,9 @@ static bool test_OpenPrinter(struct torture_context *tctx,
static bool call_OpenPrinterEx(struct torture_context *tctx,
struct dcerpc_pipe *p,
- const char *name, struct policy_handle *handle)
+ const char *name,
+ struct spoolss_DeviceMode *devmode,
+ struct policy_handle *handle)
{
struct spoolss_OpenPrinterEx r;
struct spoolss_UserLevel1 userlevel1;
@@ -3352,7 +3440,7 @@ static bool call_OpenPrinterEx(struct torture_context *tctx,
}
r.in.datatype = NULL;
- r.in.devmode_ctr.devmode= NULL;
+ r.in.devmode_ctr.devmode= devmode;
r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
r.in.level = 1;
r.in.userlevel.level1 = &userlevel1;
@@ -3384,7 +3472,7 @@ static bool test_OpenPrinterEx(struct torture_context *tctx,
struct policy_handle handle;
bool ret = true;
- if (!call_OpenPrinterEx(tctx, p, name, &handle)) {
+ if (!call_OpenPrinterEx(tctx, p, name, NULL, &handle)) {
return false;
}
@@ -3913,7 +4001,7 @@ static bool test_AddPrinter_normal(struct torture_context *tctx,
if (W_ERROR_EQUAL(result, WERR_PRINTER_ALREADY_EXISTS)) {
struct policy_handle printer_handle;
- torture_assert(tctx, call_OpenPrinterEx(tctx, p, printername, &printer_handle),
+ torture_assert(tctx, call_OpenPrinterEx(tctx, p, printername, NULL, &printer_handle),
"failed to open printer handle");
torture_assert(tctx, test_DeletePrinter(tctx, p, &printer_handle),
@@ -4180,7 +4268,7 @@ static bool test_printer(struct torture_context *tctx,
ret = false;
}
- if (!test_PrinterInfo_DevMode(tctx, p, &handle[0])) {
+ if (!test_PrinterInfo_DevMode(tctx, p, &handle[0], TORTURE_PRINTER)) {
ret = false;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list