The Samba-Bugzilla – Attachment 2693 Details for
Bug 4618
can't compile C++ application using samba headers
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch fixing (part of?) the issue
no-public-2007-05-15.patch (text/plain), 40.39 KB, created by
Brad Hards
on 2007-05-15 07:12:51 UTC
(
hide
)
Description:
patch fixing (part of?) the issue
Filename:
MIME Type:
Creator:
Brad Hards
Created:
2007-05-15 07:12:51 UTC
Size:
40.39 KB
patch
obsolete
>Index: source/winbind/wb_cmd_getdcname.c >=================================================================== >--- source/winbind/wb_cmd_getdcname.c (revision 22735) >+++ source/winbind/wb_cmd_getdcname.c (working copy) >@@ -93,7 +93,7 @@ > static void getdcname_recv_dcname(struct rpc_request *req) > { > struct cmd_getdcname_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct cmd_getdcname_state); > > state->ctx->status = dcerpc_ndr_request_recv(req); >Index: source/winbind/wb_sam_logon.c >=================================================================== >--- source/winbind/wb_sam_logon.c (revision 22735) >+++ source/winbind/wb_sam_logon.c (working copy) >@@ -121,7 +121,7 @@ > */ > static void wb_sam_logon_recv_samlogon(struct rpc_request *req) > { >- struct wb_sam_logon_state *s = talloc_get_type(req->async.private, >+ struct wb_sam_logon_state *s = talloc_get_type(req->async.private_data, > struct wb_sam_logon_state); > > s->ctx->status = dcerpc_ndr_request_recv(req); >Index: source/winbind/wb_cmd_usersids.c >=================================================================== >--- source/winbind/wb_cmd_usersids.c (revision 22735) >+++ source/winbind/wb_cmd_usersids.c (working copy) >@@ -135,7 +135,7 @@ > static void usersids_recv_aliases(struct rpc_request *req) > { > struct cmd_usersids_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct cmd_usersids_state); > int i; > >Index: source/winbind/wb_connect_lsa.c >=================================================================== >--- source/winbind/wb_connect_lsa.c (revision 22735) >+++ source/winbind/wb_connect_lsa.c (working copy) >@@ -178,7 +178,7 @@ > static void init_lsa_recv_openpol(struct rpc_request *req) > { > struct init_lsa_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct init_lsa_state); > > state->ctx->status = dcerpc_ndr_request_recv(req); >Index: source/winbind/wb_connect_sam.c >=================================================================== >--- source/winbind/wb_connect_sam.c (revision 22735) >+++ source/winbind/wb_connect_sam.c (working copy) >@@ -180,7 +180,7 @@ > static void connect_samr_recv_conn(struct rpc_request *req) > { > struct connect_samr_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct connect_samr_state); > > state->ctx->status = dcerpc_ndr_request_recv(req); >@@ -204,7 +204,7 @@ > static void connect_samr_recv_open(struct rpc_request *req) > { > struct connect_samr_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct connect_samr_state); > > state->ctx->status = dcerpc_ndr_request_recv(req); >Index: source/winbind/wb_init_domain.c >=================================================================== >--- source/winbind/wb_init_domain.c (revision 22735) >+++ source/winbind/wb_init_domain.c (working copy) >@@ -259,7 +259,7 @@ > static void init_domain_recv_queryinfo(struct rpc_request *req) > { > struct init_domain_state *state = >- talloc_get_type(req->async.private, struct init_domain_state); >+ talloc_get_type(req->async.private_data, struct init_domain_state); > struct lsa_DomainInfo *dominfo; > struct composite_context *ctx; > const char *ldap_url; >Index: source/winbind/wb_pam_auth.c >=================================================================== >--- source/winbind/wb_pam_auth.c (revision 22735) >+++ source/winbind/wb_pam_auth.c (working copy) >@@ -180,7 +180,7 @@ > static void pam_auth_crap_recv_samlogon(struct rpc_request *req) > { > struct pam_auth_crap_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct pam_auth_crap_state); > struct netr_SamBaseInfo *base; > DATA_BLOB tmp_blob; >Index: source/winbind/wb_cmd_list_trustdom.c >=================================================================== >--- source/winbind/wb_cmd_list_trustdom.c (revision 22735) >+++ source/winbind/wb_cmd_list_trustdom.c (working copy) >@@ -124,7 +124,7 @@ > static void cmd_list_trustdoms_recv_doms(struct rpc_request *req) > { > struct cmd_list_trustdom_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct cmd_list_trustdom_state); > int i, old_num_domains; > >Index: source/winbind/wb_async_helpers.c >=================================================================== >--- source/winbind/wb_async_helpers.c (revision 22735) >+++ source/winbind/wb_async_helpers.c (working copy) >@@ -148,7 +148,7 @@ > static void get_schannel_creds_recv_chal(struct rpc_request *req) > { > struct composite_context *c = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct composite_context); > struct get_schannel_creds_state *state = > talloc_get_type(c->private_data, >@@ -192,7 +192,7 @@ > static void get_schannel_creds_recv_auth(struct rpc_request *req) > { > struct composite_context *c = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct composite_context); > struct get_schannel_creds_state *state = > talloc_get_type(c->private_data, >@@ -301,7 +301,7 @@ > if (req == NULL) goto failed; > > req->async.callback = lsa_lookupsids_recv_names; >- req->async.private = state; >+ req->async.private_data = state; > return result; > > failed: >@@ -312,7 +312,7 @@ > static void lsa_lookupsids_recv_names(struct rpc_request *req) > { > struct lsa_lookupsids_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct lsa_lookupsids_state); > int i; > >@@ -456,7 +456,7 @@ > if (req == NULL) goto failed; > > req->async.callback = lsa_lookupnames_recv_sids; >- req->async.private = state; >+ req->async.private_data = state; > return result; > > failed: >@@ -467,7 +467,7 @@ > static void lsa_lookupnames_recv_sids(struct rpc_request *req) > { > struct lsa_lookupnames_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct lsa_lookupnames_state); > int i; > >@@ -652,7 +652,7 @@ > if (req == NULL) goto failed; > > req->async.callback = samr_usergroups_recv_open; >- req->async.private = state; >+ req->async.private_data = state; > return result; > > failed: >@@ -663,7 +663,7 @@ > static void samr_usergroups_recv_open(struct rpc_request *req) > { > struct samr_getuserdomgroups_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct samr_getuserdomgroups_state); > > state->ctx->status = dcerpc_ndr_request_recv(req); >@@ -682,7 +682,7 @@ > static void samr_usergroups_recv_groups(struct rpc_request *req) > { > struct samr_getuserdomgroups_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct samr_getuserdomgroups_state); > > state->ctx->status = dcerpc_ndr_request_recv(req); >@@ -701,7 +701,7 @@ > static void samr_usergroups_recv_close(struct rpc_request *req) > { > struct samr_getuserdomgroups_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct samr_getuserdomgroups_state); > > state->ctx->status = dcerpc_ndr_request_recv(req); >Index: source/winbind/wb_dom_info_trusted.c >=================================================================== >--- source/winbind/wb_dom_info_trusted.c (revision 22735) >+++ source/winbind/wb_dom_info_trusted.c (working copy) >@@ -117,7 +117,7 @@ > static void trusted_dom_info_recv_dsr(struct rpc_request *req) > { > struct trusted_dom_info_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct trusted_dom_info_state); > > state->ctx->status = dcerpc_ndr_request_recv(req); >@@ -171,7 +171,7 @@ > static void trusted_dom_info_recv_dcname(struct rpc_request *req) > { > struct trusted_dom_info_state *state = >- talloc_get_type(req->async.private, >+ talloc_get_type(req->async.private_data, > struct trusted_dom_info_state); > struct composite_context *ctx; > struct nbt_name name; >Index: source/dsdb/repl/drepl_out_helpers.c >=================================================================== >--- source/dsdb/repl/drepl_out_helpers.c (revision 22735) >+++ source/dsdb/repl/drepl_out_helpers.c (working copy) >@@ -123,7 +123,7 @@ > > static void dreplsrv_out_drsuapi_bind_recv(struct rpc_request *req) > { >- struct dreplsrv_out_drsuapi_state *st = talloc_get_type(req->async.private, >+ struct dreplsrv_out_drsuapi_state *st = talloc_get_type(req->async.private_data, > struct dreplsrv_out_drsuapi_state); > struct composite_context *c = st->creq; > >@@ -286,7 +286,7 @@ > > static void dreplsrv_op_pull_source_get_changes_recv(struct rpc_request *req) > { >- struct dreplsrv_op_pull_source_state *st = talloc_get_type(req->async.private, >+ struct dreplsrv_op_pull_source_state *st = talloc_get_type(req->async.private_data, > struct dreplsrv_op_pull_source_state); > struct composite_context *c = st->creq; > struct drsuapi_DsGetNCChanges *r = talloc_get_type(req->ndr.struct_ptr, >Index: source/libnet/libnet_unbecome_dc.c >=================================================================== >--- source/libnet/libnet_unbecome_dc.c (revision 22735) >+++ source/libnet/libnet_unbecome_dc.c (working copy) >@@ -588,7 +588,7 @@ > > static void unbecomeDC_drsuapi_bind_recv(struct rpc_request *req) > { >- struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_UnbecomeDC_state); > struct composite_context *c = s->creq; > >@@ -641,7 +641,7 @@ > > static void unbecomeDC_drsuapi_remove_ds_server_recv(struct rpc_request *req) > { >- struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_UnbecomeDC_state); > struct composite_context *c = s->creq; > struct drsuapi_DsRemoveDSServer *r = &s->drsuapi.rm_ds_srv_r; >Index: source/libnet/libnet_domain.c >=================================================================== >--- source/libnet/libnet_domain.c (revision 22735) >+++ source/libnet/libnet_domain.c (working copy) >@@ -94,7 +94,7 @@ > struct domain_open_samr_state *s; > struct rpc_request *conn_req; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_open_samr_state); > > /* receive samr_Close reply */ >@@ -130,7 +130,7 @@ > struct rpc_request *lookup_req; > struct samr_LookupDomain *r; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_open_samr_state); > > /* receive samr_Connect reply */ >@@ -160,7 +160,7 @@ > struct rpc_request *opendom_req; > struct samr_OpenDomain *r; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_open_samr_state); > > /* receive samr_LookupDomain reply */ >@@ -198,7 +198,7 @@ > struct composite_context *c; > struct domain_open_samr_state *s; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_open_samr_state); > > /* receive samr_OpenDomain reply */ >@@ -473,7 +473,7 @@ > struct composite_context *c; > struct domain_open_lsa_state *s; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_open_lsa_state); > > c->status = dcerpc_ndr_request_recv(req); >@@ -664,7 +664,7 @@ > struct composite_context *c; > struct domain_close_lsa_state *s; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_close_lsa_state); > > c->status = dcerpc_ndr_request_recv(req); >@@ -757,7 +757,7 @@ > struct composite_context *c; > struct domain_close_samr_state *s; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_close_samr_state); > > c->status = dcerpc_ndr_request_recv(req); >@@ -909,7 +909,7 @@ > struct domain_list_state *s; > struct rpc_request *enumdom_req; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_list_state); > > c->status = dcerpc_ndr_request_recv(req); >@@ -939,7 +939,7 @@ > struct rpc_request *enumdom_req; > struct rpc_request *samrclose_req; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_list_state); > > c->status = dcerpc_ndr_request_recv(req); >@@ -990,7 +990,7 @@ > struct composite_context *c; > struct domain_list_state *s; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct domain_list_state); > > c->status = dcerpc_ndr_request_recv(req); >Index: source/libnet/userman.c >=================================================================== >--- source/libnet/userman.c (revision 22735) >+++ source/libnet/userman.c (working copy) >@@ -76,7 +76,7 @@ > */ > static void useradd_handler(struct rpc_request *req) > { >- struct composite_context *c = req->async.private; >+ struct composite_context *c = req->async.private_data; > struct useradd_state *s = talloc_get_type(c->private_data, struct useradd_state); > struct monitor_msg msg; > struct msg_rpc_create_user *rpc_create; >@@ -156,7 +156,7 @@ > > /* callback handler for continuation */ > s->req->async.callback = useradd_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > s->stage = USERADD_CREATE; > > return c; >@@ -266,7 +266,7 @@ > > /* callback handler setup */ > s->req->async.callback = userdel_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > s->stage = USERDEL_OPEN; > > return NT_STATUS_OK; >@@ -293,7 +293,7 @@ > > /* callback handler setup */ > s->req->async.callback = userdel_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > s->stage = USERDEL_DELETE; > > return NT_STATUS_OK; >@@ -333,7 +333,7 @@ > struct msg_rpc_lookup_name *msg_lookup; > struct msg_rpc_open_user *msg_open; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct userdel_state); > > switch (s->stage) { >@@ -433,7 +433,7 @@ > > /* callback handler setup */ > s->req->async.callback = userdel_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > s->stage = USERDEL_LOOKUP; > > return c; >@@ -545,7 +545,7 @@ > > /* callback handler setup */ > s->req->async.callback = usermod_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > s->stage = USERMOD_OPEN; > > return NT_STATUS_OK; >@@ -717,7 +717,7 @@ > > /* callback handler setup */ > s->req->async.callback = usermod_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > > return NT_STATUS_OK; > } >@@ -765,7 +765,7 @@ > > /* callback handler setup */ > s->req->async.callback = usermod_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > > return NT_STATUS_OK; > } >@@ -811,7 +811,7 @@ > struct msg_rpc_lookup_name *msg_lookup; > struct msg_rpc_open_user *msg_open; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct usermod_state); > > switch (s->stage) { >@@ -929,7 +929,7 @@ > > /* callback handler setup */ > s->req->async.callback = usermod_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > s->stage = USERMOD_LOOKUP; > > return c; >Index: source/libnet/libnet_user.c >=================================================================== >--- source/libnet/libnet_user.c (revision 22735) >+++ source/libnet/libnet_user.c (working copy) >@@ -949,7 +949,7 @@ > struct rpc_request *enum_req; > BOOL prereq_met = False; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct userlist_state); > > /* receive result of rpc request */ >@@ -1020,7 +1020,7 @@ > struct userlist_state *s; > int i; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct userlist_state); > > /* receive result of rpc request */ >Index: source/libnet/userinfo.c >=================================================================== >--- source/libnet/userinfo.c (revision 22735) >+++ source/libnet/userinfo.c (working copy) >@@ -85,7 +85,7 @@ > if (s->req == NULL) goto failure; > > s->req->async.callback = userinfo_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > s->stage = USERINFO_OPENUSER; > > return NT_STATUS_OK; >@@ -114,7 +114,7 @@ > if (s->req == NULL) goto failure; > > s->req->async.callback = userinfo_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > s->stage = USERINFO_GETUSER; > > return NT_STATUS_OK; >@@ -147,7 +147,7 @@ > s->req = dcerpc_samr_Close_send(s->pipe, c, &s->samrclose); > > s->req->async.callback = userinfo_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > s->stage = USERINFO_CLOSEUSER; > > return NT_STATUS_OK; >@@ -178,7 +178,7 @@ > */ > static void userinfo_handler(struct rpc_request *req) > { >- struct composite_context *c = req->async.private; >+ struct composite_context *c = req->async.private_data; > struct userinfo_state *s = talloc_get_type(c->private_data, struct userinfo_state); > struct monitor_msg msg; > struct msg_rpc_lookup_name *msg_lookup; >@@ -310,7 +310,7 @@ > > /* callback handler */ > s->req->async.callback = userinfo_handler; >- s->req->async.private = c; >+ s->req->async.private_data = c; > > return c; > >Index: source/libnet/libnet_become_dc.c >=================================================================== >--- source/libnet/libnet_become_dc.c (revision 22735) >+++ source/libnet/libnet_become_dc.c (working copy) >@@ -1647,7 +1647,7 @@ > > static void becomeDC_drsuapi1_bind_recv(struct rpc_request *req) > { >- struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_BecomeDC_state); > struct composite_context *c = s->creq; > WERROR status; >@@ -2127,7 +2127,7 @@ > > static void becomeDC_drsuapi1_add_entry_recv(struct rpc_request *req) > { >- struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_BecomeDC_state); > struct composite_context *c = s->creq; > struct drsuapi_DsAddEntry *r = talloc_get_type(req->ndr.struct_ptr, >@@ -2259,7 +2259,7 @@ > > static void becomeDC_drsuapi2_bind_recv(struct rpc_request *req) > { >- struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_BecomeDC_state); > struct composite_context *c = s->creq; > char *binding_str; >@@ -2481,7 +2481,7 @@ > > static void becomeDC_drsuapi3_pull_schema_recv(struct rpc_request *req) > { >- struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_BecomeDC_state); > struct composite_context *c = s->creq; > struct drsuapi_DsGetNCChanges *r = talloc_get_type(req->ndr.struct_ptr, >@@ -2543,7 +2543,7 @@ > > static void becomeDC_drsuapi3_pull_config_recv(struct rpc_request *req) > { >- struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_BecomeDC_state); > struct composite_context *c = s->creq; > struct drsuapi_DsGetNCChanges *r = talloc_get_type(req->ndr.struct_ptr, >@@ -2611,7 +2611,7 @@ > > static void becomeDC_drsuapi3_pull_domain_recv(struct rpc_request *req) > { >- struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_BecomeDC_state); > struct composite_context *c = s->creq; > struct drsuapi_DsGetNCChanges *r = talloc_get_type(req->ndr.struct_ptr, >@@ -2687,7 +2687,7 @@ > > static void becomeDC_drsuapi2_update_refs_schema_recv(struct rpc_request *req) > { >- struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_BecomeDC_state); > struct composite_context *c = s->creq; > struct drsuapi_DsReplicaUpdateRefs *r = talloc_get_type(req->ndr.struct_ptr, >@@ -2720,7 +2720,7 @@ > > static void becomeDC_drsuapi2_update_refs_config_recv(struct rpc_request *req) > { >- struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_BecomeDC_state); > struct composite_context *c = s->creq; > struct drsuapi_DsReplicaUpdateRefs *r = talloc_get_type(req->ndr.struct_ptr, >@@ -2742,7 +2742,7 @@ > > static void becomeDC_drsuapi2_update_refs_domain_recv(struct rpc_request *req) > { >- struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private, >+ struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data, > struct libnet_BecomeDC_state); > struct composite_context *c = s->creq; > struct drsuapi_DsReplicaUpdateRefs *r = talloc_get_type(req->ndr.struct_ptr, >Index: source/libnet/libnet_lookup.c >=================================================================== >--- source/libnet/libnet_lookup.c (revision 22735) >+++ source/libnet/libnet_lookup.c (working copy) >@@ -347,7 +347,7 @@ > struct composite_context *c; > struct lookup_name_state *s; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct lookup_name_state); > > c->status = dcerpc_ndr_request_recv(req); >Index: source/libnet/libnet_rpc.c >=================================================================== >--- source/libnet/libnet_rpc.c (revision 22735) >+++ source/libnet/libnet_rpc.c (working copy) >@@ -516,7 +516,7 @@ > struct rpc_connect_dci_state *s; > struct rpc_request *query_info_req; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct rpc_connect_dci_state); > > c->status = dcerpc_ndr_request_recv(req); >@@ -559,7 +559,7 @@ > struct rpc_connect_dci_state *s; > struct rpc_request *query_info_req; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct rpc_connect_dci_state); > > c->status = dcerpc_ndr_request_recv(req); >@@ -620,7 +620,7 @@ > struct composite_context *c; > struct rpc_connect_dci_state *s; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct rpc_connect_dci_state); > > c->status = dcerpc_ndr_request_recv(req); >Index: source/libcli/composite/composite.c >=================================================================== >--- source/libcli/composite/composite.c (revision 22735) >+++ source/libcli/composite/composite.c (working copy) >@@ -158,7 +158,7 @@ > { > if (composite_nomem(new_req, ctx)) return; > new_req->async.callback = continuation; >- new_req->async.private = private_data; >+ new_req->async.private_data = private_data; > } > > _PUBLIC_ void composite_continue_irpc(struct composite_context *ctx, >Index: source/torture/rpc/lsa.c >=================================================================== >--- source/torture/rpc/lsa.c (revision 22735) >+++ source/torture/rpc/lsa.c (working copy) >@@ -516,7 +516,7 @@ > > static void lookupsids_cb(struct rpc_request *req) > { >- int *replies = (int *)req->async.private; >+ int *replies = (int *)req->async.private_data; > NTSTATUS status; > > status = dcerpc_ndr_request_recv(req); >@@ -578,7 +578,7 @@ > } > > req[i]->async.callback = lookupsids_cb; >- req[i]->async.private = &replies; >+ req[i]->async.private_data = &replies; > } > > while (replies >= 0 && replies < num_async_requests) { >Index: source/torture/rpc/netlogon.c >=================================================================== >--- source/torture/rpc/netlogon.c (revision 22735) >+++ source/torture/rpc/netlogon.c (working copy) >@@ -1372,7 +1372,7 @@ > > static void async_callback(struct rpc_request *req) > { >- int *counter = req->async.private; >+ int *counter = req->async.private_data; > if (NT_STATUS_IS_OK(req->status)) { > (*counter)++; > } >@@ -1431,7 +1431,7 @@ > req[i] = dcerpc_netr_LogonGetDomainInfo_send(p, mem_ctx, &r); > > req[i]->async.callback = async_callback; >- req[i]->async.private = async_counter; >+ req[i]->async.private_data = async_counter; > > /* even with this flush per request a w2k3 server seems to > clag with multiple outstanding requests. bleergh. */ >Index: source/librpc/rpc/dcerpc_sock.c >=================================================================== >--- source/librpc/rpc/dcerpc_sock.c (revision 22735) >+++ source/librpc/rpc/dcerpc_sock.c (working copy) >@@ -46,7 +46,7 @@ > */ > static void sock_dead(struct dcerpc_connection *p, NTSTATUS status) > { >- struct sock_private *sock = p->transport.private; >+ struct sock_private *sock = p->transport.private_data; > > if (!sock) return; > >@@ -112,7 +112,7 @@ > { > struct dcerpc_connection *p = talloc_get_type(private, > struct dcerpc_connection); >- struct sock_private *sock = p->transport.private; >+ struct sock_private *sock = p->transport.private_data; > sock->pending_reads--; > if (sock->pending_reads == 0) { > packet_recv_disable(sock->packet); >@@ -129,7 +129,7 @@ > { > struct dcerpc_connection *p = talloc_get_type(private, > struct dcerpc_connection); >- struct sock_private *sock = p->transport.private; >+ struct sock_private *sock = p->transport.private_data; > > if (flags & EVENT_FD_WRITE) { > packet_queue_run(sock->packet); >@@ -150,7 +150,7 @@ > */ > static NTSTATUS sock_send_read(struct dcerpc_connection *p) > { >- struct sock_private *sock = p->transport.private; >+ struct sock_private *sock = p->transport.private_data; > sock->pending_reads++; > if (sock->pending_reads == 1) { > packet_recv_enable(sock->packet); >@@ -164,7 +164,7 @@ > static NTSTATUS sock_send_request(struct dcerpc_connection *p, DATA_BLOB *data, > BOOL trigger_read) > { >- struct sock_private *sock = p->transport.private; >+ struct sock_private *sock = p->transport.private_data; > DATA_BLOB blob; > NTSTATUS status; > >@@ -194,7 +194,7 @@ > */ > static NTSTATUS sock_shutdown_pipe(struct dcerpc_connection *p, NTSTATUS status) > { >- struct sock_private *sock = p->transport.private; >+ struct sock_private *sock = p->transport.private_data; > > if (sock && sock->sock) { > sock_dead(p, status); >@@ -208,7 +208,7 @@ > */ > static const char *sock_peer_name(struct dcerpc_connection *p) > { >- struct sock_private *sock = talloc_get_type(p->transport.private, struct sock_private); >+ struct sock_private *sock = talloc_get_type(p->transport.private_data, struct sock_private); > return sock->server_name; > } > >@@ -217,7 +217,7 @@ > */ > static const char *sock_target_hostname(struct dcerpc_connection *p) > { >- struct sock_private *sock = talloc_get_type(p->transport.private, struct sock_private); >+ struct sock_private *sock = talloc_get_type(p->transport.private_data, struct sock_private); > return sock->server_name; > } > >@@ -258,7 +258,7 @@ > fill in the transport methods > */ > conn->transport.transport = s->transport; >- conn->transport.private = NULL; >+ conn->transport.private_data = NULL; > > conn->transport.send_request = sock_send_request; > conn->transport.send_read = sock_send_read; >@@ -275,7 +275,7 @@ > sock->fde = event_add_fd(conn->event_ctx, sock->sock, socket_get_fd(sock->sock), > EVENT_FD_READ, sock_io_handler, conn); > >- conn->transport.private = sock; >+ conn->transport.private_data = sock; > > sock->packet = packet_init(sock); > if (sock->packet == NULL) { >Index: source/librpc/rpc/dcerpc.c >=================================================================== >--- source/librpc/rpc/dcerpc.c (revision 22735) >+++ source/librpc/rpc/dcerpc.c (working copy) >@@ -527,7 +527,7 @@ > */ > static void dcerpc_composite_fail(struct rpc_request *req) > { >- struct composite_context *c = talloc_get_type(req->async.private, >+ struct composite_context *c = talloc_get_type(req->async.private_data, > struct composite_context); > composite_error(c, req->status); > } >@@ -629,7 +629,7 @@ > struct composite_context *c; > struct dcerpc_connection *conn; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > > if (pkt->ptype == DCERPC_PKT_BIND_NAK) { > DEBUG(2,("dcerpc: bind_nak reason %d\n", >@@ -747,7 +747,7 @@ > > req->state = RPC_REQUEST_PENDING; > req->call_id = pkt.call_id; >- req->async.private = c; >+ req->async.private_data = c; > req->async.callback = dcerpc_composite_fail; > req->p = p; > req->recv_handler = dcerpc_bind_recv_handler; >@@ -958,7 +958,7 @@ > req->async_call = async; > req->ignore_timeout = False; > req->async.callback = NULL; >- req->async.private = NULL; >+ req->async.private_data = NULL; > req->recv_handler = NULL; > > if (object != NULL) { >@@ -1526,7 +1526,7 @@ > struct composite_context *c; > struct dcerpc_pipe *recv_pipe; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > recv_pipe = talloc_get_type(c->private_data, struct dcerpc_pipe); > > if (pkt->ptype == DCERPC_PKT_ALTER_RESP && >@@ -1618,7 +1618,7 @@ > > req->state = RPC_REQUEST_PENDING; > req->call_id = pkt.call_id; >- req->async.private = c; >+ req->async.private_data = c; > req->async.callback = dcerpc_composite_fail; > req->p = p; > req->recv_handler = dcerpc_alter_recv_handler; >Index: source/librpc/rpc/dcerpc_smb.c >=================================================================== >--- source/librpc/rpc/dcerpc_smb.c (revision 22735) >+++ source/librpc/rpc/dcerpc_smb.c (working copy) >@@ -40,7 +40,7 @@ > */ > static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status) > { >- struct smb_private *smb = c->transport.private; >+ struct smb_private *smb = c->transport.private_data; > > if (smb->dead) { > return; >@@ -85,7 +85,7 @@ > NTSTATUS status; > > state = talloc_get_type(req->async.private, struct smb_read_state); >- smb = talloc_get_type(state->c->transport.private, struct smb_private); >+ smb = talloc_get_type(state->c->transport.private_data, struct smb_private); > io = state->io; > > status = smb_raw_read_recv(state->req, io); >@@ -142,7 +142,7 @@ > */ > static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLOB *blob) > { >- struct smb_private *smb = c->transport.private; >+ struct smb_private *smb = c->transport.private_data; > union smb_read *io; > struct smb_read_state *state; > struct smbcli_request *req; >@@ -198,7 +198,7 @@ > */ > static NTSTATUS send_read_request(struct dcerpc_connection *c) > { >- struct smb_private *smb = c->transport.private; >+ struct smb_private *smb = c->transport.private_data; > > if (smb->dead) { > return NT_STATUS_CONNECTION_DISCONNECTED; >@@ -250,7 +250,7 @@ > */ > static NTSTATUS smb_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *blob) > { >- struct smb_private *smb = c->transport.private; >+ struct smb_private *smb = c->transport.private_data; > struct smb_trans2 *trans; > uint16_t setup[2]; > struct smb_trans_state *state; >@@ -313,7 +313,7 @@ > */ > static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, BOOL trigger_read) > { >- struct smb_private *smb = c->transport.private; >+ struct smb_private *smb = c->transport.private_data; > union smb_write io; > struct smbcli_request *req; > >@@ -357,7 +357,7 @@ > */ > static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status) > { >- struct smb_private *smb = c->transport.private; >+ struct smb_private *smb = c->transport.private_data; > union smb_close io; > struct smbcli_request *req; > >@@ -383,7 +383,7 @@ > */ > static const char *smb_peer_name(struct dcerpc_connection *c) > { >- struct smb_private *smb = c->transport.private; >+ struct smb_private *smb = c->transport.private_data; > return smb->server_name; > } > >@@ -392,7 +392,7 @@ > */ > static const char *smb_target_hostname(struct dcerpc_connection *c) > { >- struct smb_private *smb = talloc_get_type(c->transport.private, struct smb_private); >+ struct smb_private *smb = talloc_get_type(c->transport.private_data, struct smb_private); > return smb->tree->session->transport->socket->hostname; > } > >@@ -401,7 +401,7 @@ > */ > static NTSTATUS smb_session_key(struct dcerpc_connection *c, DATA_BLOB *session_key) > { >- struct smb_private *smb = c->transport.private; >+ struct smb_private *smb = c->transport.private_data; > > if (smb->tree->session->user_session_key.data) { > *session_key = smb->tree->session->user_session_key; >@@ -504,7 +504,7 @@ > fill in the transport methods > */ > c->transport.transport = NCACN_NP; >- c->transport.private = NULL; >+ c->transport.private_data = NULL; > c->transport.shutdown_pipe = smb_shutdown_pipe; > c->transport.peer_name = smb_peer_name; > c->transport.target_hostname = smb_target_hostname; >@@ -526,7 +526,7 @@ > if (composite_nomem(smb->server_name, ctx)) return; > smb->dead = false; > >- c->transport.private = smb; >+ c->transport.private_data = smb; > > composite_done(ctx); > } >@@ -556,7 +556,7 @@ > > if (c->transport.transport != NCACN_NP) return NULL; > >- smb = talloc_get_type(c->transport.private, struct smb_private); >+ smb = talloc_get_type(c->transport.private_data, struct smb_private); > if (!smb) return NULL; > > return smb->tree; >Index: source/librpc/rpc/dcerpc_smb2.c >=================================================================== >--- source/librpc/rpc/dcerpc_smb2.c (revision 22735) >+++ source/librpc/rpc/dcerpc_smb2.c (working copy) >@@ -42,7 +42,7 @@ > */ > static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status) > { >- struct smb2_private *smb = c->transport.private; >+ struct smb2_private *smb = c->transport.private_data; > > if (smb->dead) { > return; >@@ -84,7 +84,7 @@ > NTSTATUS status; > > state = talloc_get_type(req->async.private, struct smb2_read_state); >- smb = talloc_get_type(state->c->transport.private, struct smb2_private); >+ smb = talloc_get_type(state->c->transport.private_data, struct smb2_private); > > status = smb2_read_recv(req, state, &io); > if (NT_STATUS_IS_ERR(status)) { >@@ -147,7 +147,7 @@ > */ > static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLOB *blob) > { >- struct smb2_private *smb = c->transport.private; >+ struct smb2_private *smb = c->transport.private_data; > struct smb2_read io; > struct smb2_read_state *state; > struct smb2_request *req; >@@ -192,7 +192,7 @@ > */ > static NTSTATUS send_read_request(struct dcerpc_connection *c) > { >- struct smb2_private *smb = c->transport.private; >+ struct smb2_private *smb = c->transport.private_data; > > if (smb->dead) { > return NT_STATUS_CONNECTION_DISCONNECTED; >@@ -243,7 +243,7 @@ > */ > static NTSTATUS smb2_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *blob) > { >- struct smb2_private *smb = talloc_get_type(c->transport.private, >+ struct smb2_private *smb = talloc_get_type(c->transport.private_data, > struct smb2_private); > struct smb2_ioctl io; > struct smb2_trans_state *state; >@@ -298,7 +298,7 @@ > static NTSTATUS smb2_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, > BOOL trigger_read) > { >- struct smb2_private *smb = c->transport.private; >+ struct smb2_private *smb = c->transport.private_data; > struct smb2_write io; > struct smb2_request *req; > >@@ -330,7 +330,7 @@ > */ > static NTSTATUS smb2_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status) > { >- struct smb2_private *smb = c->transport.private; >+ struct smb2_private *smb = c->transport.private_data; > struct smb2_close io; > struct smb2_request *req; > >@@ -355,7 +355,7 @@ > */ > static const char *smb2_peer_name(struct dcerpc_connection *c) > { >- struct smb2_private *smb = talloc_get_type(c->transport.private, >+ struct smb2_private *smb = talloc_get_type(c->transport.private_data, > struct smb2_private); > return smb->server_name; > } >@@ -365,7 +365,7 @@ > */ > static const char *smb2_target_hostname(struct dcerpc_connection *c) > { >- struct smb2_private *smb = talloc_get_type(c->transport.private, >+ struct smb2_private *smb = talloc_get_type(c->transport.private_data, > struct smb2_private); > return smb->tree->session->transport->socket->hostname; > } >@@ -375,7 +375,7 @@ > */ > static NTSTATUS smb2_session_key(struct dcerpc_connection *c, DATA_BLOB *session_key) > { >- struct smb2_private *smb = talloc_get_type(c->transport.private, >+ struct smb2_private *smb = talloc_get_type(c->transport.private_data, > struct smb2_private); > *session_key = smb->tree->session->session_key; > if (session_key->data == NULL) { >@@ -460,7 +460,7 @@ > fill in the transport methods > */ > c->transport.transport = NCACN_NP; >- c->transport.private = NULL; >+ c->transport.private_data = NULL; > c->transport.shutdown_pipe = smb2_shutdown_pipe; > c->transport.peer_name = smb2_peer_name; > c->transport.target_hostname = smb2_target_hostname; >@@ -482,7 +482,7 @@ > if (composite_nomem(smb->server_name, ctx)) return; > smb->dead = false; > >- c->transport.private = smb; >+ c->transport.private_data = smb; > > composite_done(ctx); > } >@@ -507,7 +507,7 @@ > */ > struct smb2_tree *dcerpc_smb2_tree(struct dcerpc_connection *c) > { >- struct smb2_private *smb = talloc_get_type(c->transport.private, >+ struct smb2_private *smb = talloc_get_type(c->transport.private_data, > struct smb2_private); > return smb->tree; > } >Index: source/librpc/rpc/dcerpc.h >=================================================================== >--- source/librpc/rpc/dcerpc.h (revision 22735) >+++ source/librpc/rpc/dcerpc.h (working copy) >@@ -62,7 +62,7 @@ > > struct dcerpc_transport { > enum dcerpc_transport_t transport; >- void *private; >+ void *private_data; > > NTSTATUS (*shutdown_pipe)(struct dcerpc_connection *, NTSTATUS status); > >@@ -258,7 +258,7 @@ > > struct { > void (*callback)(struct rpc_request *); >- void *private; >+ void *private_data; > } async; > }; > >Index: source/librpc/rpc/dcerpc_schannel.c >=================================================================== >--- source/librpc/rpc/dcerpc_schannel.c (revision 22735) >+++ source/librpc/rpc/dcerpc_schannel.c (working copy) >@@ -156,7 +156,7 @@ > struct schannel_key_state *s; > struct rpc_request *srv_auth2_req; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct schannel_key_state); > > /* receive rpc request result - netlogon challenge */ >@@ -199,7 +199,7 @@ > struct composite_context *c; > struct schannel_key_state *s; > >- c = talloc_get_type(req->async.private, struct composite_context); >+ c = talloc_get_type(req->async.private_data, struct composite_context); > s = talloc_get_type(c->private_data, struct schannel_key_state); > > /* receive rpc request result - auth2 credentials */ >Index: source/librpc/rpc/dcerpc_util.c >=================================================================== >--- source/librpc/rpc/dcerpc_util.c (revision 22735) >+++ source/librpc/rpc/dcerpc_util.c (working copy) >@@ -830,7 +830,7 @@ > */ > static void continue_epm_map(struct rpc_request *req) > { >- struct composite_context *c = talloc_get_type(req->async.private, >+ struct composite_context *c = talloc_get_type(req->async.private_data, > struct composite_context); > struct epm_map_binding_state *s = talloc_get_type(c->private_data, > struct epm_map_binding_state);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=2693">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 4618
: 2693