sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4:rpc_server: s/private/private_data

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2009-02-02 10:01:36 +01:00
parent 476aa1f00d
commit 5bca70a0c2
7 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/rpc_server/dcerpc_server.c
View File

@ -603,7 +603,7 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
* it also matches samba3
*/
context->assoc_group_id = SAMBA_ASSOC_GROUP;
context->private = NULL;
context->private_data = NULL;
context->handles = NULL;
DLIST_ADD(call->conn->contexts, context);
call->context = context;
@ -767,7 +767,7 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_
context->iface = iface;
context->context_id = context_id;
context->assoc_group_id = SAMBA_ASSOC_GROUP;
context->private = NULL;
context->private_data = NULL;
context->handles = NULL;
DLIST_ADD(call->conn->contexts, context);
call->context = context;

4
source4/rpc_server/dcerpc_server.h
View File

@ -66,7 +66,7 @@ struct dcesrv_interface {
NTSTATUS (*ndr_push)(struct dcesrv_call_state *, TALLOC_CTX *, struct ndr_push *, const void *);
/* for any private use by the interface code */
const void *private;
const void *private_data;
};
enum dcesrv_call_list {
@ -162,7 +162,7 @@ struct dcesrv_connection_context {
const struct dcesrv_interface *iface;
/* private data for the interface implementation */
void *private;
void *private_data;
/* current rpc handles - this is really the wrong scope for
them, but it will do for now */

8
source4/rpc_server/netlogon/dcerpc_netlogon.c
View File

@ -47,7 +47,7 @@ struct server_pipe_state {
static NTSTATUS dcesrv_netr_ServerReqChallenge(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct netr_ServerReqChallenge *r)
{
struct server_pipe_state *pipe_state = dce_call->context->private;
struct server_pipe_state *pipe_state = dce_call->context->private_data;
ZERO_STRUCTP(r->out.return_credentials);
@ -55,7 +55,7 @@ static NTSTATUS dcesrv_netr_ServerReqChallenge(struct dcesrv_call_state *dce_cal
if (pipe_state) {
talloc_free(pipe_state);
dce_call->context->private = NULL;
dce_call->context->private_data = NULL;
}
pipe_state = talloc(dce_call->context, struct server_pipe_state);
@ -68,7 +68,7 @@ static NTSTATUS dcesrv_netr_ServerReqChallenge(struct dcesrv_call_state *dce_cal
*r->out.return_credentials = pipe_state->server_challenge;
dce_call->context->private = pipe_state;
dce_call->context->private_data = pipe_state;
return NT_STATUS_OK;
}
@ -76,7 +76,7 @@ static NTSTATUS dcesrv_netr_ServerReqChallenge(struct dcesrv_call_state *dce_cal
static NTSTATUS dcesrv_netr_ServerAuthenticate3(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct netr_ServerAuthenticate3 *r)
{
struct server_pipe_state *pipe_state = dce_call->context->private;
struct server_pipe_state *pipe_state = dce_call->context->private_data;
struct creds_CredentialState *creds;
void *sam_ctx;
struct samr_Password *mach_pwd;

16
source4/rpc_server/remote/dcesrv_remote.c
View File

@ -53,7 +53,7 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
}
priv->c_pipe = NULL;
dce_call->context->private = priv;
dce_call->context->private_data = priv;
if (!binding) {
DEBUG(0,("You must specify a DCE/RPC binding string\n"));
@ -116,7 +116,7 @@ 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 *priv = (struct dcesrv_remote_private *)context->private;
struct dcesrv_remote_private *priv = (struct dcesrv_remote_private *)context->private_data;
talloc_free(priv->c_pipe);
@ -126,7 +126,7 @@ static void remote_op_unbind(struct dcesrv_connection_context *context, const st
static NTSTATUS remote_op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_pull *pull, void **r)
{
enum ndr_err_code ndr_err;
const struct ndr_interface_table *table = (const struct ndr_interface_table *)dce_call->context->iface->private;
const struct ndr_interface_table *table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
uint16_t opnum = dce_call->pkt.u.request.opnum;
dce_call->fault_code = 0;
@ -156,9 +156,9 @@ 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 *priv = dce_call->context->private;
struct dcesrv_remote_private *priv = dce_call->context->private_data;
uint16_t opnum = dce_call->pkt.u.request.opnum;
const struct ndr_interface_table *table = dce_call->context->iface->private;
const struct ndr_interface_table *table = dce_call->context->iface->private_data;
const struct ndr_interface_call *call;
const char *name;
@ -191,7 +191,7 @@ static NTSTATUS remote_op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CT
static NTSTATUS remote_op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_push *push, const void *r)
{
enum ndr_err_code ndr_err;
const struct ndr_interface_table *table = dce_call->context->iface->private;
const struct ndr_interface_table *table = dce_call->context->iface->private_data;
uint16_t opnum = dce_call->pkt.u.request.opnum;
/* unravel the NDR for the packet */
@ -207,7 +207,7 @@ static NTSTATUS remote_op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_CT
static NTSTATUS remote_register_one_iface(struct dcesrv_context *dce_ctx, const struct dcesrv_interface *iface)
{
int i;
const struct ndr_interface_table *table = iface->private;
const struct ndr_interface_table *table = iface->private_data;
for (i=0;i<table->endpoints->count;i++) {
NTSTATUS ret;
@ -268,7 +268,7 @@ static bool remote_fill_interface(struct dcesrv_interface *iface, const struct n
iface->reply = remote_op_reply;
iface->ndr_push = remote_op_ndr_push;
iface->private = if_tabl;
iface->private_data = if_tabl;
return true;
}

14
source4/rpc_server/spoolss/dcesrv_spoolss.c
View File

@ -220,7 +220,7 @@ static NTSTATUS dcerpc_spoolss_bind(struct dcesrv_call_state *dce_call, const st
lp_ntptr_providor(dce_call->conn->dce_ctx->lp_ctx), &ntptr);
NT_STATUS_NOT_OK_RETURN(status);
dce_call->context->private = ntptr;
dce_call->context->private_data = ntptr;
return NT_STATUS_OK;
}
@ -233,7 +233,7 @@ static NTSTATUS dcerpc_spoolss_bind(struct dcesrv_call_state *dce_call, const st
static WERROR dcesrv_spoolss_EnumPrinters(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct spoolss_EnumPrinters *r)
{
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private_data, struct ntptr_context);
WERROR status;
struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
@ -369,7 +369,7 @@ static WERROR dcesrv_spoolss_AddPrinterDriver(struct dcesrv_call_state *dce_call
static WERROR dcesrv_spoolss_EnumPrinterDrivers(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct spoolss_EnumPrinterDrivers *r)
{
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private_data, struct ntptr_context);
WERROR status;
struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
@ -402,7 +402,7 @@ static WERROR dcesrv_spoolss_GetPrinterDriver(struct dcesrv_call_state *dce_call
static WERROR dcesrv_spoolss_GetPrinterDriverDirectory(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct spoolss_GetPrinterDriverDirectory *r)
{
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private_data, struct ntptr_context);
WERROR status;
struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
@ -796,7 +796,7 @@ static WERROR dcesrv_spoolss_EnumForms(struct dcesrv_call_state *dce_call, TALLO
static WERROR dcesrv_spoolss_EnumPorts(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct spoolss_EnumPorts *r)
{
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private_data, struct ntptr_context);
WERROR status;
struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
@ -819,7 +819,7 @@ static WERROR dcesrv_spoolss_EnumPorts(struct dcesrv_call_state *dce_call, TALLO
static WERROR dcesrv_spoolss_EnumMonitors(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct spoolss_EnumMonitors *r)
{
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private_data, struct ntptr_context);
WERROR status;
struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
@ -1228,7 +1228,7 @@ static WERROR dcesrv_spoolss_44(struct dcesrv_call_state *dce_call, TALLOC_CTX *
static WERROR dcesrv_spoolss_OpenPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct spoolss_OpenPrinterEx *r)
{
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private_data, struct ntptr_context);
struct ntptr_GenericHandle *handle;
struct dcesrv_handle *h;
const char *server;

10
source4/rpc_server/unixinfo/dcesrv_unixinfo.c
View File

@ -36,7 +36,7 @@ static NTSTATUS dcerpc_unixinfo_bind(struct dcesrv_call_state *dce_call,
dce_call->event_ctx);
NT_STATUS_HAVE_NO_MEMORY(wbc_ctx);
dce_call->context->private = wbc_ctx;
dce_call->context->private_data = wbc_ctx;
return NT_STATUS_OK;
}
@ -49,7 +49,7 @@ static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call,
{
NTSTATUS status;
struct wbc_context *wbc_ctx = talloc_get_type_abort(
dce_call->context->private,
dce_call->context->private_data,
struct wbc_context);
struct id_mapping *ids;
struct composite_context *ctx;
@ -82,7 +82,7 @@ static NTSTATUS dcesrv_unixinfo_UidToSid(struct dcesrv_call_state *dce_call,
struct unixinfo_UidToSid *r)
{
struct wbc_context *wbc_ctx = talloc_get_type_abort(
dce_call->context->private,
dce_call->context->private_data,
struct wbc_context);
struct id_mapping *ids;
struct composite_context *ctx;
@ -124,7 +124,7 @@ static NTSTATUS dcesrv_unixinfo_SidToGid(struct dcesrv_call_state *dce_call,
{
NTSTATUS status;
struct wbc_context *wbc_ctx = talloc_get_type_abort(
dce_call->context->private,
dce_call->context->private_data,
struct wbc_context);
struct id_mapping *ids;
struct composite_context *ctx;
@ -157,7 +157,7 @@ static NTSTATUS dcesrv_unixinfo_GidToSid(struct dcesrv_call_state *dce_call,
struct unixinfo_GidToSid *r)
{
struct wbc_context *wbc_ctx = talloc_get_type_abort(
dce_call->context->private,
dce_call->context->private_data,
struct wbc_context);
struct id_mapping *ids;
struct composite_context *ctx;

4
source4/rpc_server/winreg/rpc_winreg.c
View File

@ -46,7 +46,7 @@ static NTSTATUS dcerpc_winreg_bind(struct dcesrv_call_state *dce_call,
return NT_STATUS_UNSUCCESSFUL;
}
dce_call->context->private = ctx;
dce_call->context->private_data = ctx;
return NT_STATUS_OK;
}
@ -57,7 +57,7 @@ static WERROR dcesrv_winreg_openhive(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx, uint32_t hkey,
struct policy_handle **outh)
{
struct registry_context *ctx = dce_call->context->private;
struct registry_context *ctx = dce_call->context->private_data;
struct dcesrv_handle *h;
WERROR result;