spoolss: rename spoolss_RpcEnumJobNamedProperties to spoolss_EnumJobNamedProperties

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 797720d70b1e3f3f0165b0c0fe94ed7802956a20..4e7dcf873761623c795ec84153febd372275c32c 100644 (file)
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -3407,7 +3407,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
 
        /******************/
        /* Function: 0x71 */
-       WERROR spoolss_RpcEnumJobNamedProperties(
+       WERROR spoolss_EnumJobNamedProperties(
                [in,ref] policy_handle *hPrinter,
                [in] uint32 JobId,
                [out,ref] uint32 *pcProperties,

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index b89a66cb39bbd44a5c947f86cf362227a62a111c..765d54d999437ca13fb626993295c537c50a30f7 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -11281,11 +11281,11 @@ WERROR _spoolss_DeleteJobNamedProperty(struct pipes_struct *p,
 }
 
 /****************************************************************
- _spoolss_RpcEnumJobNamedProperties
+ _spoolss_EnumJobNamedProperties
 ****************************************************************/
 
-WERROR _spoolss_RpcEnumJobNamedProperties(struct pipes_struct *p,
-                                         struct spoolss_RpcEnumJobNamedProperties *r)
+WERROR _spoolss_EnumJobNamedProperties(struct pipes_struct *p,
+                                      struct spoolss_EnumJobNamedProperties *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 6ecd4e842190f413082ea671ed9643d62797d8ac..b5c5cc2a87768728a7626bf148219dcc89d3b117 100644 (file)
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3315,7 +3315,7 @@ static bool test_JobPropertiesEnum(struct torture_context *tctx,
                                   struct policy_handle *handle,
                                   uint32_t job_id)
 {
-       struct spoolss_RpcEnumJobNamedProperties r;
+       struct spoolss_EnumJobNamedProperties r;
        uint32_t pcProperties = 0;
        struct RPC_PrintNamedProperty *ppProperties = NULL;
 
@@ -3324,13 +3324,13 @@ static bool test_JobPropertiesEnum(struct torture_context *tctx,
        r.out.pcProperties = &pcProperties;
        r.out.ppProperties = &ppProperties;
 
-       torture_comment(tctx, "Testing RpcEnumJobNamedProperties(%d)\n", job_id);
+       torture_comment(tctx, "Testing EnumJobNamedProperties(%d)\n", job_id);
 
        torture_assert_ntstatus_ok(tctx,
-               dcerpc_spoolss_RpcEnumJobNamedProperties_r(b, tctx, &r),
-               "spoolss_RpcEnumJobNamedProperties failed");
+               dcerpc_spoolss_EnumJobNamedProperties_r(b, tctx, &r),
+               "spoolss_EnumJobNamedProperties failed");
        torture_assert_werr_ok(tctx, r.out.result,
-               "spoolss_RpcEnumJobNamedProperties failed");
+               "spoolss_EnumJobNamedProperties failed");
 
        return true;
 }