summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-06-04 19:02:17 +0200
committerGünther Deschner <gd@samba.org>2010-06-05 00:35:09 +0200
commit29c0c103afed7238698cc83ff3ab017fc1510dcd (patch)
tree78d90a063671eef302aa980a49e7fde173601c1f /source4
parentb3ebebd3b18e4d9ebfc50012e02f7011f8d067be (diff)
downloadsamba-29c0c103afed7238698cc83ff3ab017fc1510dcd.tar.gz
samba-29c0c103afed7238698cc83ff3ab017fc1510dcd.tar.bz2
samba-29c0c103afed7238698cc83ff3ab017fc1510dcd.zip
s4-smbtorture: share test_ClosePrinter between RPC-SPOOLSS and RPC-SPOOLSS-WIN.
Guenther
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/rpc/spoolss.c10
-rw-r--r--source4/torture/rpc/spoolss_win.c19
2 files changed, 3 insertions, 26 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 7154b838f3..e61adfec83 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -2185,10 +2185,6 @@ static bool call_OpenPrinterEx(struct torture_context *tctx,
struct spoolss_DeviceMode *devmode,
struct policy_handle *handle);
-static bool test_ClosePrinter(struct torture_context *tctx,
- struct dcerpc_binding_handle *b,
- struct policy_handle *handle);
-
static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
struct dcerpc_pipe *p,
struct policy_handle *handle,
@@ -2373,9 +2369,9 @@ static bool test_PrinterInfo_DevMode(struct torture_context *tctx,
return ret;
}
-static bool test_ClosePrinter(struct torture_context *tctx,
- struct dcerpc_binding_handle *b,
- struct policy_handle *handle)
+bool test_ClosePrinter(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *handle)
{
NTSTATUS status;
struct spoolss_ClosePrinter r;
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index 384dda3938..b0586e1586 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -116,9 +116,6 @@ static bool test_OpenPrinterAsAdmin(struct torture_context *tctx,
}
-static bool test_ClosePrinter(struct torture_context *tctx,
- struct dcerpc_binding_handle *b,
- struct policy_handle *handle);
/* This replicates the opening sequence of OpenPrinterEx calls XP does */
static bool test_OpenPrinterSequence(struct torture_context *tctx,
@@ -453,22 +450,6 @@ static bool test_EnumPrinterDataEx(struct torture_context *tctx,
return true;
}
-static bool test_ClosePrinter(struct torture_context *tctx,
- struct dcerpc_binding_handle *b,
- struct policy_handle *handle)
-{
- NTSTATUS status;
- struct spoolss_ClosePrinter cp;
-
- cp.in.handle = handle;
- cp.out.handle = handle;
-
- status = dcerpc_spoolss_ClosePrinter_r(b, tctx, &cp);
- torture_assert_ntstatus_ok(tctx, status, "ClosePrinter failed");
-
- return true;
-}
-
static bool test_WinXP(struct torture_context *tctx, struct dcerpc_pipe *p)
{
bool ret = true;