From cdf958824ef5e9dac0b5c2d62e9c842437038dd3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Mon, 29 Aug 2016 12:54:47 +0200 Subject: [PATCH] spoolss: rename spoolss_RpcDeleteJobNamedProperty to spoolss_DeleteJobNamedProperty 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/rpc/spoolss.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index 8f62eb179b4..797720d70b1 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -3399,7 +3399,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") /******************/ /* Function: 0x70 */ - WERROR spoolss_RpcDeleteJobNamedProperty( + WERROR spoolss_DeleteJobNamedProperty( [in,ref] policy_handle *hPrinter, [in] uint32 JobId, [in] [string,charset(UTF16)] uint16 *pszName diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 65606dcd81e..b89a66cb39b 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -11270,11 +11270,11 @@ WERROR _spoolss_SetJobNamedProperty(struct pipes_struct *p, } /**************************************************************** - _spoolss_RpcDeleteJobNamedProperty + _spoolss_DeleteJobNamedProperty ****************************************************************/ -WERROR _spoolss_RpcDeleteJobNamedProperty(struct pipes_struct *p, - struct spoolss_RpcDeleteJobNamedProperty *r) +WERROR _spoolss_DeleteJobNamedProperty(struct pipes_struct *p, + struct spoolss_DeleteJobNamedProperty *r) { p->fault_state = DCERPC_FAULT_OP_RNG_ERROR; return WERR_NOT_SUPPORTED; diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 9cdd94f5b4f..6ecd4e84219 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -3392,20 +3392,20 @@ static bool test_JobPropertyDelete(struct torture_context *tctx, uint32_t job_id, const char *property_name) { - struct spoolss_RpcDeleteJobNamedProperty r; + struct spoolss_DeleteJobNamedProperty r; r.in.hPrinter = handle; r.in.JobId = job_id; r.in.pszName = property_name; - torture_comment(tctx, "Testing RpcDeleteJobNamedProperty(%d) %s\n", + torture_comment(tctx, "Testing DeleteJobNamedProperty(%d) %s\n", job_id, property_name); torture_assert_ntstatus_ok(tctx, - dcerpc_spoolss_RpcDeleteJobNamedProperty_r(b, tctx, &r), - "spoolss_RpcDeleteJobNamedProperty failed"); + dcerpc_spoolss_DeleteJobNamedProperty_r(b, tctx, &r), + "spoolss_DeleteJobNamedProperty failed"); torture_assert_werr_ok(tctx, r.out.result, - "spoolss_RpcDeleteJobNamedProperty failed"); + "spoolss_DeleteJobNamedProperty failed"); return true; } -- 2.34.1