From 66780e016b13db8b88eb209f568aedac6e6cf740 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Tue, 30 Jun 2009 11:38:41 +0200 Subject: [PATCH] s4-smbtorture: remove trailing whitespace from RPC-SPOOLSS. Guenther --- source4/torture/rpc/spoolss.c | 196 +++++++++++++++++----------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 464049405c75..ad86df6baa36 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -1,21 +1,21 @@ -/* +/* Unix SMB/CIFS implementation. test suite for spoolss rpc operations Copyright (C) Tim Potter 2003 Copyright (C) Stefan Metzmacher 2005 Copyright (C) Jelmer Vernooij 2007 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -89,13 +89,13 @@ static bool test_OpenPrinter_server(struct torture_context *tctx, struct dcerpc_ status = dcerpc_spoolss_OpenPrinter(p, ctx, &op); torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_OpenPrinter failed"); - torture_assert_werr_ok(tctx, op.out.result, "dcerpc_spoolss_OpenPrinter failed"); + torture_assert_werr_ok(tctx, op.out.result, "dcerpc_spoolss_OpenPrinter failed"); return true; } -static bool test_EnumPorts(struct torture_context *tctx, - struct dcerpc_pipe *p, +static bool test_EnumPorts(struct torture_context *tctx, + struct dcerpc_pipe *p, struct test_spoolss_context *ctx) { NTSTATUS status; @@ -126,7 +126,7 @@ static bool test_EnumPorts(struct torture_context *tctx, /* TODO: do some more checks here */ continue; } - torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, + torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, "EnumPorts unexpected return code"); blob = data_blob_talloc(ctx, NULL, needed); @@ -148,7 +148,7 @@ static bool test_EnumPorts(struct torture_context *tctx, for (i=1;iport_count[level], ctx->port_count[old_level], + torture_assert_int_equal(tctx, ctx->port_count[level], ctx->port_count[old_level], "EnumPorts invalid value"); } /* if the array sizes are not the same we would maybe segfault in the following code */ @@ -235,8 +235,8 @@ static bool test_GetPrintProcessorDirectory(struct torture_context *tctx, } -static bool test_GetPrinterDriverDirectory(struct torture_context *tctx, - struct dcerpc_pipe *p, +static bool test_GetPrinterDriverDirectory(struct torture_context *tctx, + struct dcerpc_pipe *p, struct test_spoolss_context *ctx) { NTSTATUS status; @@ -278,9 +278,9 @@ static bool test_GetPrinterDriverDirectory(struct torture_context *tctx, torture_comment(tctx, "Testing GetPrinterDriverDirectory level %u\n", r.in.level); status = dcerpc_spoolss_GetPrinterDriverDirectory(p, ctx, &r); - torture_assert_ntstatus_ok(tctx, status, + torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_GetPrinterDriverDirectory failed"); - torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, + torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, "GetPrinterDriverDirectory unexpected return code"); blob = data_blob_talloc(ctx, NULL, needed); @@ -297,7 +297,7 @@ static bool test_GetPrinterDriverDirectory(struct torture_context *tctx, return true; } -static bool test_EnumPrinterDrivers(struct torture_context *tctx, +static bool test_EnumPrinterDrivers(struct torture_context *tctx, struct dcerpc_pipe *p, struct test_spoolss_context *ctx) { @@ -334,7 +334,7 @@ static bool test_EnumPrinterDrivers(struct torture_context *tctx, torture_comment(tctx, "Testing EnumPrinterDrivers level %u (%s)\n", r.in.level, r.in.environment); status = dcerpc_spoolss_EnumPrinterDrivers(p, ctx, &r); - torture_assert_ntstatus_ok(tctx, status, + torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrinterDrivers failed"); if (W_ERROR_IS_OK(r.out.result)) { /* TODO: do some more checks here */ @@ -444,8 +444,8 @@ static bool test_EnumPrinterDrivers(struct torture_context *tctx, return true; } -static bool test_EnumMonitors(struct torture_context *tctx, - struct dcerpc_pipe *p, +static bool test_EnumMonitors(struct torture_context *tctx, + struct dcerpc_pipe *p, struct test_spoolss_context *ctx) { NTSTATUS status; @@ -476,7 +476,7 @@ static bool test_EnumMonitors(struct torture_context *tctx, /* TODO: do some more checks here */ continue; } - torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, + torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, "EnumMonitors failed"); blob = data_blob_talloc(ctx, NULL, needed); @@ -496,7 +496,7 @@ static bool test_EnumMonitors(struct torture_context *tctx, for (i=1;imonitor_count[level], ctx->monitor_count[old_level], + torture_assert_int_equal(tctx, ctx->monitor_count[level], ctx->monitor_count[old_level], "EnumMonitors invalid value"); } @@ -519,7 +519,7 @@ static bool test_EnumMonitors(struct torture_context *tctx, return true; } -static bool test_EnumPrintProcessors(struct torture_context *tctx, +static bool test_EnumPrintProcessors(struct torture_context *tctx, struct dcerpc_pipe *p, struct test_spoolss_context *ctx) { @@ -552,7 +552,7 @@ static bool test_EnumPrintProcessors(struct torture_context *tctx, /* TODO: do some more checks here */ continue; } - torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, + torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, "EnumPrintProcessors unexpected return code"); blob = data_blob_talloc(ctx, NULL, needed); @@ -645,7 +645,7 @@ static bool test_EnumPrintProcDataTypes(struct torture_context *tctx, } -static bool test_EnumPrinters(struct torture_context *tctx, +static bool test_EnumPrinters(struct torture_context *tctx, struct dcerpc_pipe *p, struct test_spoolss_context *ctx) { @@ -678,7 +678,7 @@ static bool test_EnumPrinters(struct torture_context *tctx, /* TODO: do some more checks here */ continue; } - torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, + torture_assert_werr_equal(tctx, r.out.result, WERR_INSUFFICIENT_BUFFER, "EnumPrinters unexpected return code"); blob = data_blob_talloc(ctx, NULL, needed); @@ -714,7 +714,7 @@ static bool test_EnumPrinters(struct torture_context *tctx, COMPARE_UINT32(tctx, cur->info0, ref->info2, cjobs); /*COMPARE_UINT32(tctx, cur->info0, ref->info2, total_jobs); COMPARE_UINT32(tctx, cur->info0, ref->info2, total_bytes); - COMPARE_SPOOLSS_TIME(cur->info0, ref->info2, spoolss_Time time); + COMPARE_SPOOLSS_TIME(cur->info0, ref->info2, spoolss_Time time); COMPARE_UINT32(tctx, cur->info0, ref->info2, global_counter); COMPARE_UINT32(tctx, cur->info0, ref->info2, total_pages); COMPARE_UINT32(tctx, cur->info0, ref->info2, version); @@ -771,8 +771,8 @@ static bool test_EnumPrinters(struct torture_context *tctx, return true; } -static bool test_GetPrinter(struct torture_context *tctx, - struct dcerpc_pipe *p, +static bool test_GetPrinter(struct torture_context *tctx, + struct dcerpc_pipe *p, struct policy_handle *handle) { NTSTATUS status; @@ -780,7 +780,7 @@ static bool test_GetPrinter(struct torture_context *tctx, uint16_t levels[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; int i; uint32_t needed; - + for (i=0;ilast_fault_code, DCERPC_FAULT_CONTEXT_MISMATCH, + torture_assert_int_equal(tctx, p2->last_fault_code, DCERPC_FAULT_CONTEXT_MISMATCH, "Unexpected fault code"); talloc_free(p2); @@ -1657,7 +1657,7 @@ static bool test_SecondaryClosePrinter(struct torture_context *tctx, return true; } -static bool test_OpenPrinter_badname(struct torture_context *tctx, +static bool test_OpenPrinter_badname(struct torture_context *tctx, struct dcerpc_pipe *p, const char *name) { NTSTATUS status; @@ -1709,8 +1709,8 @@ static bool test_OpenPrinter_badname(struct torture_context *tctx, return ret; } -static bool test_OpenPrinter(struct torture_context *tctx, - struct dcerpc_pipe *p, +static bool test_OpenPrinter(struct torture_context *tctx, + struct dcerpc_pipe *p, const char *name) { NTSTATUS status; @@ -1749,8 +1749,8 @@ static bool test_OpenPrinter(struct torture_context *tctx, return ret; } -static bool call_OpenPrinterEx(struct torture_context *tctx, - struct dcerpc_pipe *p, +static bool call_OpenPrinterEx(struct torture_context *tctx, + struct dcerpc_pipe *p, const char *name, struct policy_handle *handle) { struct spoolss_OpenPrinterEx r; @@ -1758,10 +1758,10 @@ static bool call_OpenPrinterEx(struct torture_context *tctx, NTSTATUS status; if (name && name[0]) { - r.in.printername = talloc_asprintf(tctx, "\\\\%s\\%s", + r.in.printername = talloc_asprintf(tctx, "\\\\%s\\%s", dcerpc_server_name(p), name); } else { - r.in.printername = talloc_asprintf(tctx, "\\\\%s", + r.in.printername = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p)); } @@ -1785,14 +1785,14 @@ static bool call_OpenPrinterEx(struct torture_context *tctx, status = dcerpc_spoolss_OpenPrinterEx(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "OpenPrinterEx failed"); - + torture_assert_werr_ok(tctx, r.out.result, "OpenPrinterEx failed"); return true; } -static bool test_OpenPrinterEx(struct torture_context *tctx, - struct dcerpc_pipe *p, +static bool test_OpenPrinterEx(struct torture_context *tctx, + struct dcerpc_pipe *p, const char *name) { struct policy_handle handle; @@ -1847,7 +1847,7 @@ static bool test_OpenPrinterEx(struct torture_context *tctx, if (!test_ClosePrinter(tctx, p, &handle)) { ret = false; } - + return ret; } @@ -1923,8 +1923,8 @@ static bool test_EnumPrinters_old(struct torture_context *tctx, struct dcerpc_pi } #if 0 -static bool test_GetPrinterDriver2(struct dcerpc_pipe *p, - struct policy_handle *handle, +static bool test_GetPrinterDriver2(struct dcerpc_pipe *p, + struct policy_handle *handle, const char *driver_name) { NTSTATUS status; @@ -1956,15 +1956,15 @@ static bool test_GetPrinterDriver2(struct dcerpc_pipe *p, r.in.offered = needed; status = dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r); } - + if (!NT_STATUS_IS_OK(status)) { - printf("GetPrinterDriver2 failed - %s\n", + printf("GetPrinterDriver2 failed - %s\n", nt_errstr(status)); return false; } if (!W_ERROR_IS_OK(r.out.result)) { - printf("GetPrinterDriver2 failed - %s\n", + printf("GetPrinterDriver2 failed - %s\n", win_errstr(r.out.result)); return false; } @@ -1973,7 +1973,7 @@ static bool test_GetPrinterDriver2(struct dcerpc_pipe *p, } #endif -static bool test_EnumPrinterDrivers_old(struct torture_context *tctx, +static bool test_EnumPrinterDrivers_old(struct torture_context *tctx, struct dcerpc_pipe *p) { struct spoolss_EnumPrinterDrivers r; @@ -2068,7 +2068,7 @@ bool torture_rpc_spoolss(struct torture_context *torture) ret &= test_OpenPrinter_badname(torture, p, "\\\\\\"); ret &= test_OpenPrinter_badname(torture, p, "\\\\\\__INVALID_PRINTER__"); ret &= test_OpenPrinter_badname(torture, p, talloc_asprintf(torture, "\\\\%s\\", dcerpc_server_name(p))); - ret &= test_OpenPrinter_badname(torture, p, + ret &= test_OpenPrinter_badname(torture, p, talloc_asprintf(torture, "\\\\%s\\__INVALID_PRINTER__", dcerpc_server_name(p))); -- 2.34.1