sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

spoolss: rename spoolss_RpcSetJobNamedProperty to spoolss_SetJobNamedProperty

Browse Source 
Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Günther Deschner 2016-08-29 12:53:45 +02:00
parent d64b316fed
commit 17d94d0531
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librpc/idl/spoolss.idl
View File

@ -3391,7 +3391,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
/******************/ /******************/
/* Function: 0x6f */ /* Function: 0x6f */
[public] WERROR spoolss_RpcSetJobNamedProperty( [public] WERROR spoolss_SetJobNamedProperty(
[in,ref] policy_handle *hPrinter, [in,ref] policy_handle *hPrinter,
[in] uint32 JobId, [in] uint32 JobId,
[in,ref] RPC_PrintNamedProperty *pProperty [in,ref] RPC_PrintNamedProperty *pProperty

6
source3/rpc_server/spoolss/srv_spoolss_nt.c
View File

@ -11259,11 +11259,11 @@ WERROR _spoolss_GetJobNamedPropertyValue(struct pipes_struct *p,
} }
/**************************************************************** /****************************************************************
_spoolss_RpcSetJobNamedProperty _spoolss_SetJobNamedProperty
****************************************************************/ ****************************************************************/
WERROR _spoolss_RpcSetJobNamedProperty(struct pipes_struct *p, WERROR _spoolss_SetJobNamedProperty(struct pipes_struct *p,
struct spoolss_RpcSetJobNamedProperty *r) struct spoolss_SetJobNamedProperty *r)
{ {
p->fault_state = DCERPC_FAULT_OP_RNG_ERROR; p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
return WERR_NOT_SUPPORTED; return WERR_NOT_SUPPORTED;

8
source4/torture/ndr/spoolss.c
View File

@ -1740,7 +1740,7 @@ static const uint8_t getcoreprinterdrivers_64_req_data[] = {
0x04, 0x00, 0x00, 0x00 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, 0x00, 0x00, 0x00, 0x00, 0x3d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xff, 0x50, 0xdf, 0xe4, 0xce, 0x1a, 0x00, 0x00, 0x05, 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, 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 0x4e, 0x00, 0x4f, 0x00, 0x57, 0x00, 0x4e, 0x00, 0x00, 0x00
}; };
static bool rpcsetjobnamedproperty_req_check(struct torture_context *tctx, static bool setjobnamedproperty_req_check(struct torture_context *tctx,
struct spoolss_RpcSetJobNamedProperty *r) struct spoolss_SetJobNamedProperty *r)
{ {
/* FIXME hPrinter */ /* FIXME hPrinter */
torture_assert_int_equal(tctx, r->in.JobId, 0x00000005, "JobId"); 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_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; return suite;
} }

10
source4/torture/rpc/spoolss.c
View File

@ -3341,21 +3341,21 @@ static bool test_JobPropertySet(struct torture_context *tctx,
uint32_t job_id, uint32_t job_id,
struct RPC_PrintNamedProperty *property) struct RPC_PrintNamedProperty *property)
{ {
struct spoolss_RpcSetJobNamedProperty r; struct spoolss_SetJobNamedProperty r;
r.in.hPrinter = handle; r.in.hPrinter = handle;
r.in.JobId = job_id; r.in.JobId = job_id;
r.in.pProperty = property; 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, job_id, property->propertyName,
property->propertyValue.ePropertyType); property->propertyValue.ePropertyType);
torture_assert_ntstatus_ok(tctx, torture_assert_ntstatus_ok(tctx,
dcerpc_spoolss_RpcSetJobNamedProperty_r(b, tctx, &r), dcerpc_spoolss_SetJobNamedProperty_r(b, tctx, &r),
"spoolss_RpcSetJobNamedProperty failed"); "spoolss_SetJobNamedProperty failed");
torture_assert_werr_ok(tctx, r.out.result, torture_assert_werr_ok(tctx, r.out.result,
"spoolss_RpcSetJobNamedProperty failed"); "spoolss_SetJobNamedProperty failed");
return true; return true;
} }