s4:rpc_server/remote: s/private/priv

metze

diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index 1310ecee90e04c5b0c3ddce4344731d2983b5ff6..7354854e9c664c0606d205a7353d6565a325a655 100644 (file)
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -39,7 +39,7 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
 {
         NTSTATUS status;
        const struct ndr_interface_table *table;
-        struct dcesrv_remote_private *private;
+       struct dcesrv_remote_private *priv;
        const char *binding = lp_parm_string(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_remote", "binding");
        const char *user, *pass, *domain;
        struct cli_credentials *credentials;
@@ -47,13 +47,13 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
 
        machine_account = lp_parm_bool(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_remote", "use_machine_account", false);
 
-       private = talloc(dce_call->conn, struct dcesrv_remote_private);
-       if (!private) {
+       priv = talloc(dce_call->conn, struct dcesrv_remote_private);
+       if (!priv) {
                return NT_STATUS_NO_MEMORY;     
        }
        
-       private->c_pipe = NULL;
-       dce_call->context->private = private;
+       priv->c_pipe = NULL;
+       dce_call->context->private = priv;
 
        if (!binding) {
                DEBUG(0,("You must specify a DCE/RPC binding string\n"));
@@ -72,7 +72,7 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
 
        if (user && pass) {
                DEBUG(5, ("dcerpc_remote: RPC Proxy: Using specified account\n"));
-               credentials = cli_credentials_init(private);
+               credentials = cli_credentials_init(priv);
                if (!credentials) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -84,7 +84,7 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
                cli_credentials_set_password(credentials, pass, CRED_SPECIFIED);
        } else if (machine_account) {
                DEBUG(5, ("dcerpc_remote: RPC Proxy: Using machine account\n"));
-               credentials = cli_credentials_init(private);
+               credentials = cli_credentials_init(priv);
                cli_credentials_set_conf(credentials, dce_call->conn->dce_ctx->lp_ctx);
                if (domain) {
                        cli_credentials_set_domain(credentials, domain, CRED_SPECIFIED);
@@ -101,8 +101,8 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       status = dcerpc_pipe_connect(private, 
-                                    &(private->c_pipe), binding, table,
+       status = dcerpc_pipe_connect(priv,
+                                    &(priv->c_pipe), binding, table,
                                     credentials, dce_call->event_ctx,
                                     dce_call->conn->dce_ctx->lp_ctx);
 
@@ -116,9 +116,9 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
 
 static void remote_op_unbind(struct dcesrv_connection_context *context, const struct dcesrv_interface *iface)
 {
-       struct dcesrv_remote_private *private = (struct dcesrv_remote_private *)context->private;
+       struct dcesrv_remote_private *priv = (struct dcesrv_remote_private *)context->private;
 
-       talloc_free(private->c_pipe);
+       talloc_free(priv->c_pipe);
 
        return; 
 }
@@ -156,7 +156,7 @@ static NTSTATUS remote_op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CT
 
 static NTSTATUS remote_op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r)
 {
-       struct dcesrv_remote_private *private = dce_call->context->private;
+       struct dcesrv_remote_private *priv = dce_call->context->private;
        uint16_t opnum = dce_call->pkt.u.request.opnum;
        const struct ndr_interface_table *table = dce_call->context->iface->private;
        const struct ndr_interface_call *call;
@@ -165,23 +165,23 @@ static NTSTATUS remote_op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CT
        name = table->calls[opnum].name;
        call = &table->calls[opnum];
 
-       if (private->c_pipe->conn->flags & DCERPC_DEBUG_PRINT_IN) {
+       if (priv->c_pipe->conn->flags & DCERPC_DEBUG_PRINT_IN) {
                ndr_print_function_debug(call->ndr_print, name, NDR_IN | NDR_SET_VALUES, r);            
        }
 
-       private->c_pipe->conn->flags |= DCERPC_NDR_REF_ALLOC;
+       priv->c_pipe->conn->flags |= DCERPC_NDR_REF_ALLOC;
 
        /* we didn't use the return code of this function as we only check the last_fault_code */
-       dcerpc_ndr_request(private->c_pipe, NULL, table, opnum, mem_ctx,r);
+       dcerpc_ndr_request(priv->c_pipe, NULL, table, opnum, mem_ctx,r);
 
-       dce_call->fault_code = private->c_pipe->last_fault_code;
+       dce_call->fault_code = priv->c_pipe->last_fault_code;
        if (dce_call->fault_code != 0) {
                DEBUG(0,("dcesrv_remote: call[%s] failed with: %s!\n",name, dcerpc_errstr(mem_ctx, dce_call->fault_code)));
                return NT_STATUS_NET_WRITE_FAULT;
        }
 
        if ((dce_call->fault_code == 0) && 
-           (private->c_pipe->conn->flags & DCERPC_DEBUG_PRINT_OUT)) {
+           (priv->c_pipe->conn->flags & DCERPC_DEBUG_PRINT_OUT)) {
                ndr_print_function_debug(call->ndr_print, name, NDR_OUT, r);            
        }