From 17d94d05317adb219efea8af1b5be4d0b0cf6ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Mon, 29 Aug 2016 12:53:45 +0200 Subject: [PATCH] spoolss: rename spoolss_RpcSetJobNamedProperty to spoolss_SetJobNamedProperty Guenther Signed-off-by: Guenther Deschner Reviewed-by: Stefan Metzmacher --- librpc/idl/spoolss.idl | 2 +- source3/rpc_server/spoolss/srv_spoolss_nt.c | 6 +++--- source4/torture/ndr/spoolss.c | 8 ++++---- source4/torture/rpc/spoolss.c | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index 1110a4a5d88..8f62eb179b4 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -3391,7 +3391,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") /******************/ /* Function: 0x6f */ - [public] WERROR spoolss_RpcSetJobNamedProperty( + [public] WERROR spoolss_SetJobNamedProperty( [in,ref] policy_handle *hPrinter, [in] uint32 JobId, [in,ref] RPC_PrintNamedProperty *pProperty diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index d24ad823731..65606dcd81e 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -11259,11 +11259,11 @@ WERROR _spoolss_GetJobNamedPropertyValue(struct pipes_struct *p, } /**************************************************************** - _spoolss_RpcSetJobNamedProperty + _spoolss_SetJobNamedProperty ****************************************************************/ -WERROR _spoolss_RpcSetJobNamedProperty(struct pipes_struct *p, - struct spoolss_RpcSetJobNamedProperty *r) +WERROR _spoolss_SetJobNamedProperty(struct pipes_struct *p, + struct spoolss_SetJobNamedProperty *r) { p->fault_state = DCERPC_FAULT_OP_RNG_ERROR; return WERR_NOT_SUPPORTED; diff --git a/source4/torture/ndr/spoolss.c b/source4/torture/ndr/spoolss.c index 5818fdf209a..2f9d1365ae8 100644 --- a/source4/torture/ndr/spoolss.c +++ b/source4/torture/ndr/spoolss.c @@ -1740,7 +1740,7 @@ static const uint8_t getcoreprinterdrivers_64_req_data[] = { 0x04, 0x00, 0x00, 0x00 }; -static const uint8_t rpcsetjobnamedproperty_req_data[] = { +static const uint8_t setjobnamedproperty_req_data[] = { 0x00, 0x00, 0x00, 0x00, 0x3d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x50, 0xdf, 0xe4, 0xce, 0x1a, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, @@ -1755,8 +1755,8 @@ static const uint8_t rpcsetjobnamedproperty_req_data[] = { 0x4e, 0x00, 0x4f, 0x00, 0x57, 0x00, 0x4e, 0x00, 0x00, 0x00 }; -static bool rpcsetjobnamedproperty_req_check(struct torture_context *tctx, - struct spoolss_RpcSetJobNamedProperty *r) +static bool setjobnamedproperty_req_check(struct torture_context *tctx, + struct spoolss_SetJobNamedProperty *r) { /* FIXME hPrinter */ torture_assert_int_equal(tctx, r->in.JobId, 0x00000005, "JobId"); @@ -1829,7 +1829,7 @@ struct torture_suite *ndr_spoolss_suite(TALLOC_CTX *ctx) torture_suite_add_ndr_pull_fn_test_flags(suite, spoolss_GetCorePrinterDrivers, getcoreprinterdrivers_64_req_data, NDR_IN, LIBNDR_FLAG_NDR64, NULL); - torture_suite_add_ndr_pull_fn_test(suite, spoolss_RpcSetJobNamedProperty, rpcsetjobnamedproperty_req_data, NDR_IN, rpcsetjobnamedproperty_req_check); + torture_suite_add_ndr_pull_fn_test(suite, spoolss_SetJobNamedProperty, setjobnamedproperty_req_data, NDR_IN, setjobnamedproperty_req_check); return suite; } diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 245ef581413..9cdd94f5b4f 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -3341,21 +3341,21 @@ static bool test_JobPropertySet(struct torture_context *tctx, uint32_t job_id, struct RPC_PrintNamedProperty *property) { - struct spoolss_RpcSetJobNamedProperty r; + struct spoolss_SetJobNamedProperty r; r.in.hPrinter = handle; r.in.JobId = job_id; r.in.pProperty = property; - torture_comment(tctx, "Testing RpcSetJobNamedProperty(%d) %s - %d\n", + torture_comment(tctx, "Testing SetJobNamedProperty(%d) %s - %d\n", job_id, property->propertyName, property->propertyValue.ePropertyType); torture_assert_ntstatus_ok(tctx, - dcerpc_spoolss_RpcSetJobNamedProperty_r(b, tctx, &r), - "spoolss_RpcSetJobNamedProperty failed"); + dcerpc_spoolss_SetJobNamedProperty_r(b, tctx, &r), + "spoolss_SetJobNamedProperty failed"); torture_assert_werr_ok(tctx, r.out.result, - "spoolss_RpcSetJobNamedProperty failed"); + "spoolss_SetJobNamedProperty failed"); return true; }