From 759da3b915e2006d4c87b5ace47f399accd9ce91 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 27 Jan 2005 07:08:20 +0000 Subject: r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the large commit. I thought this was worthwhile to get done for consistency. (This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0) --- source4/rpc_server/dcerpc_server.c | 12 ++-- source4/rpc_server/dcerpc_sock.c | 12 ++-- source4/rpc_server/dcesrv_auth.c | 4 +- source4/rpc_server/dcom/remact.c | 4 +- source4/rpc_server/dcom/rot.c | 14 ++-- source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 4 +- source4/rpc_server/drsuapi/drsuapi_cracknames.c | 4 +- source4/rpc_server/dssetup/dcesrv_dssetup.c | 2 +- source4/rpc_server/echo/rpc_echo.c | 2 +- source4/rpc_server/epmapper/rpc_epmapper.c | 12 ++-- source4/rpc_server/handles.c | 2 +- source4/rpc_server/lsa/dcesrv_lsa.c | 68 +++++++++--------- source4/rpc_server/netlogon/dcerpc_netlogon.c | 14 ++-- source4/rpc_server/netlogon/schannel_state.c | 2 +- source4/rpc_server/remote/dcesrv_remote.c | 2 +- source4/rpc_server/samr/dcesrv_samr.c | 70 +++++++++--------- source4/rpc_server/samr/samr_password.c | 8 +-- source4/rpc_server/spoolss/dcesrv_spoolss.c | 10 +-- source4/rpc_server/srvsvc/dcesrv_srvsvc.c | 94 ++++++++++++------------- source4/rpc_server/winreg/rpc_winreg.c | 12 ++-- source4/rpc_server/wkssvc/dcesrv_wkssvc.c | 6 +- 21 files changed, 179 insertions(+), 179 deletions(-) (limited to 'source4/rpc_server') diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 40335e4246..575c073e46 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -179,7 +179,7 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx, /* check if this endpoint exists */ if ((ep=find_endpoint(dce_ctx, &binding))==NULL) { - ep = talloc_p(dce_ctx, struct dcesrv_endpoint); + ep = talloc(dce_ctx, struct dcesrv_endpoint); if (!ep) { return NT_STATUS_NO_MEMORY; } @@ -196,7 +196,7 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx, } /* talloc a new interface list element */ - ifl = talloc_p(dce_ctx, struct dcesrv_if_list); + ifl = talloc(dce_ctx, struct dcesrv_if_list); if (!ifl) { return NT_STATUS_NO_MEMORY; } @@ -396,7 +396,7 @@ static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code pkt.u.fault.cancel_count = 0; pkt.u.fault.status = fault_code; - rep = talloc_p(call, struct dcesrv_call_reply); + rep = talloc(call, struct dcesrv_call_reply); if (!rep) { return NT_STATUS_NO_MEMORY; } @@ -433,7 +433,7 @@ static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason) pkt.u.bind_nak.reject_reason = reason; pkt.u.bind_nak.num_versions = 0; - rep = talloc_p(call, struct dcesrv_call_reply); + rep = talloc(call, struct dcesrv_call_reply); if (!rep) { return NT_STATUS_NO_MEMORY; } @@ -544,7 +544,7 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call) pkt.u.bind_ack.secondary_address = ""; } pkt.u.bind_ack.num_results = 1; - pkt.u.bind_ack.ctx_list = talloc_p(call, struct dcerpc_ack_ctx); + pkt.u.bind_ack.ctx_list = talloc(call, struct dcerpc_ack_ctx); if (!pkt.u.bind_ack.ctx_list) { return NT_STATUS_NO_MEMORY; } @@ -709,7 +709,7 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call) return dcesrv_bind_nak(call, 0); } - rep = talloc_p(call, struct dcesrv_call_reply); + rep = talloc(call, struct dcesrv_call_reply); if (!rep) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/rpc_server/dcerpc_sock.c b/source4/rpc_server/dcerpc_sock.c index 561482a5fe..222f513bb9 100644 --- a/source4/rpc_server/dcerpc_sock.c +++ b/source4/rpc_server/dcerpc_sock.c @@ -66,9 +66,9 @@ static void add_socket_rpc_unix(struct server_service *service, struct dcesrv_en return; } - dcesrv_sock = talloc_p(stream_socket, struct dcesrv_socket_context); + dcesrv_sock = talloc(stream_socket, struct dcesrv_socket_context); if (!dcesrv_sock) { - DEBUG(0,("talloc_p(stream_socket, struct dcesrv_socket_context) failed\n")); + DEBUG(0,("talloc(stream_socket, struct dcesrv_socket_context) failed\n")); return; } @@ -102,9 +102,9 @@ static void add_socket_rpc_ncalrpc(struct server_service *service, struct dcesrv return; } - dcesrv_sock = talloc_p(stream_socket, struct dcesrv_socket_context); + dcesrv_sock = talloc(stream_socket, struct dcesrv_socket_context); if (!dcesrv_sock) { - DEBUG(0,("talloc_p(stream_socket, struct dcesrv_socket_context) failed\n")); + DEBUG(0,("talloc(stream_socket, struct dcesrv_socket_context) failed\n")); return; } @@ -143,9 +143,9 @@ static void add_socket_rpc_tcp_iface(struct server_service *service, e->ep_description.endpoint = talloc_asprintf(dce_ctx, "%d", port); } - dcesrv_sock = talloc_p(stream_socket, struct dcesrv_socket_context); + dcesrv_sock = talloc(stream_socket, struct dcesrv_socket_context); if (!dcesrv_sock) { - DEBUG(0,("talloc_p(stream_socket, struct dcesrv_socket_context) failed\n")); + DEBUG(0,("talloc(stream_socket, struct dcesrv_socket_context) failed\n")); return; } diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c index 62c879408f..f1cd916dcb 100644 --- a/source4/rpc_server/dcesrv_auth.c +++ b/source4/rpc_server/dcesrv_auth.c @@ -84,7 +84,7 @@ BOOL dcesrv_auth_bind(struct dcesrv_call_state *call) return True; } - dce_conn->auth_state.auth_info = talloc_p(dce_conn, struct dcerpc_auth); + dce_conn->auth_state.auth_info = talloc(dce_conn, struct dcerpc_auth); if (!dce_conn->auth_state.auth_info) { return False; } @@ -214,7 +214,7 @@ BOOL dcesrv_auth_alter(struct dcesrv_call_state *call) return False; } - dce_conn->auth_state.auth_info = talloc_p(dce_conn, struct dcerpc_auth); + dce_conn->auth_state.auth_info = talloc(dce_conn, struct dcerpc_auth); if (!dce_conn->auth_state.auth_info) { return False; } diff --git a/source4/rpc_server/dcom/remact.c b/source4/rpc_server/dcom/remact.c index 30e508d65b..506417d7e4 100644 --- a/source4/rpc_server/dcom/remact.c +++ b/source4/rpc_server/dcom/remact.c @@ -55,8 +55,8 @@ static WERROR RemoteActivation(struct dcesrv_call_state *dce_call, TALLOC_CTX *m /* FIXME: Loop thru given interfaces and set r->out.results and * r->out.interfaces */ - r->out.ifaces = talloc_array_p(mem_ctx, struct pMInterfacePointer, r->in.Interfaces); - r->out.results = talloc_array_p(mem_ctx, WERROR, r->in.Interfaces); + r->out.ifaces = talloc_array(mem_ctx, struct pMInterfacePointer, r->in.Interfaces); + r->out.results = talloc_array(mem_ctx, WERROR, r->in.Interfaces); r->out.hr = cr->out.result; for (i = 0; i < r->in.Interfaces; i++) { diff --git a/source4/rpc_server/dcom/rot.c b/source4/rpc_server/dcom/rot.c index 04fb7c73a5..f36eaf20d1 100644 --- a/source4/rpc_server/dcom/rot.c +++ b/source4/rpc_server/dcom/rot.c @@ -33,7 +33,7 @@ static WERROR rot_add(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -45,7 +45,7 @@ static WERROR rot_remove(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -57,7 +57,7 @@ static WERROR rot_is_listed(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -69,7 +69,7 @@ static WERROR rot_get_interface_pointer(struct dcesrv_call_state *dce_call, TALL { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -81,7 +81,7 @@ static WERROR rot_set_modification_time(struct dcesrv_call_state *dce_call, TALL { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -93,7 +93,7 @@ static WERROR rot_get_modification_time(struct dcesrv_call_state *dce_call, TALL { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -105,7 +105,7 @@ static WERROR rot_enum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c index 508a2dec5e..6a1ccb00d5 100644 --- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c +++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c @@ -40,7 +40,7 @@ static WERROR drsuapi_DsBind(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem r->out.bind_info = NULL; ZERO_STRUCTP(r->out.bind_handle); - b_state = talloc_p(dce_call->conn, struct drsuapi_bind_state); + b_state = talloc(dce_call->conn, struct drsuapi_bind_state); WERR_TALLOC_CHECK(b_state); b_state->sam_ctx = samdb_connect(b_state); @@ -57,7 +57,7 @@ static WERROR drsuapi_DsBind(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem handle->data = talloc_steal(handle, b_state); - bind_info = talloc_p(mem_ctx, struct drsuapi_DsBindInfoCtr); + bind_info = talloc(mem_ctx, struct drsuapi_DsBindInfoCtr); WERR_TALLOC_CHECK(bind_info); ZERO_STRUCT(site_guid); diff --git a/source4/rpc_server/drsuapi/drsuapi_cracknames.c b/source4/rpc_server/drsuapi/drsuapi_cracknames.c index 2ebdd59cfe..1e77ae020a 100644 --- a/source4/rpc_server/drsuapi/drsuapi_cracknames.c +++ b/source4/rpc_server/drsuapi/drsuapi_cracknames.c @@ -253,11 +253,11 @@ WERROR dcesrv_drsuapi_DsCrackNames(struct dcesrv_call_state *dce_call, TALLOC_CT int count; int i; - ctr1 = talloc_p(mem_ctx, struct drsuapi_DsNameCtr1); + ctr1 = talloc(mem_ctx, struct drsuapi_DsNameCtr1); WERR_TALLOC_CHECK(ctr1); count = r->in.req.req1.count; - names = talloc_array_p(mem_ctx, struct drsuapi_DsNameInfo1, count); + names = talloc_array(mem_ctx, struct drsuapi_DsNameInfo1, count); WERR_TALLOC_CHECK(names); for (i=0; i < count; i++) { diff --git a/source4/rpc_server/dssetup/dcesrv_dssetup.c b/source4/rpc_server/dssetup/dcesrv_dssetup.c index dd6554b9f7..2be7c684a4 100644 --- a/source4/rpc_server/dssetup/dcesrv_dssetup.c +++ b/source4/rpc_server/dssetup/dcesrv_dssetup.c @@ -36,7 +36,7 @@ static WERROR dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_call_state { union dssetup_DsRoleInfo *info; - info = talloc_p(mem_ctx, union dssetup_DsRoleInfo); + info = talloc(mem_ctx, union dssetup_DsRoleInfo); W_ERROR_HAVE_NO_MEMORY(info); switch (r->in.level) { diff --git a/source4/rpc_server/echo/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c index b793cd4da7..009fa1aa6d 100644 --- a/source4/rpc_server/echo/rpc_echo.c +++ b/source4/rpc_server/echo/rpc_echo.c @@ -71,7 +71,7 @@ static NTSTATUS echo_TestCall(struct dcesrv_call_state *dce_call, TALLOC_CTX *me static NTSTATUS echo_TestCall2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestCall2 *r) { - r->out.info = talloc_p(mem_ctx, union echo_Info); + r->out.info = talloc(mem_ctx, union echo_Info); if (!r->out.info) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c b/source4/rpc_server/epmapper/rpc_epmapper.c index 98992de74a..797dcc624e 100644 --- a/source4/rpc_server/epmapper/rpc_epmapper.c +++ b/source4/rpc_server/epmapper/rpc_epmapper.c @@ -67,7 +67,7 @@ static uint32_t build_ep_list(TALLOC_CTX *mem_ctx, struct dcerpc_binding description; for (iface=d->interface_list;iface;iface=iface->next) { - (*eps) = talloc_realloc_p(mem_ctx, + (*eps) = talloc_realloc(mem_ctx, *eps, struct dcesrv_ep_iface, total + 1); @@ -128,7 +128,7 @@ static error_status_t epm_Lookup(struct dcesrv_call_state *dce_call, TALLOC_CTX if (!eps) { /* this is the first call - fill the list. Subsequent calls will feed from this list, stored in the handle */ - eps = talloc_p(h, struct rpc_eps); + eps = talloc(h, struct rpc_eps); if (!eps) { return EPMAPPER_STATUS_NO_MEMORY; } @@ -153,7 +153,7 @@ static error_status_t epm_Lookup(struct dcesrv_call_state *dce_call, TALLOC_CTX return EPMAPPER_STATUS_NO_MORE_ENTRIES; } - r->out.entries = talloc_array_p(mem_ctx, struct epm_entry_t, num_ents); + r->out.entries = talloc_array(mem_ctx, struct epm_entry_t, num_ents); if (!r->out.entries) { return EPMAPPER_STATUS_NO_MEMORY; } @@ -161,7 +161,7 @@ static error_status_t epm_Lookup(struct dcesrv_call_state *dce_call, TALLOC_CTX for (i=0;iout.entries[i].object); r->out.entries[i].annotation = eps->e[i].name; - r->out.entries[i].tower = talloc_p(mem_ctx, struct epm_twr_t); + r->out.entries[i].tower = talloc(mem_ctx, struct epm_twr_t); if (!r->out.entries[i].tower) { return EPMAPPER_STATUS_NO_MEMORY; } @@ -192,11 +192,11 @@ static error_status_t epm_Map(struct dcesrv_call_state *dce_call, TALLOC_CTX *me ZERO_STRUCT(*r->out.entry_handle); r->out.num_towers = 1; - r->out.towers = talloc_p(mem_ctx, struct epm_twr_p_t); + r->out.towers = talloc(mem_ctx, struct epm_twr_p_t); if (!r->out.towers) { return EPMAPPER_STATUS_NO_MEMORY; } - r->out.towers->twr = talloc_p(mem_ctx, struct epm_twr_t); + r->out.towers->twr = talloc(mem_ctx, struct epm_twr_t); if (!r->out.towers->twr) { return EPMAPPER_STATUS_NO_MEMORY; } diff --git a/source4/rpc_server/handles.c b/source4/rpc_server/handles.c index df9213bfd3..b203f45e4e 100644 --- a/source4/rpc_server/handles.c +++ b/source4/rpc_server/handles.c @@ -47,7 +47,7 @@ struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection_context *contex { struct dcesrv_handle *h; - h = talloc_p(context, struct dcesrv_handle); + h = talloc(context, struct dcesrv_handle); if (!h) { return NULL; } diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index ff33d52d01..c23bbe94d0 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -166,7 +166,7 @@ static NTSTATUS lsa_EnumPrivs(struct dcesrv_call_state *dce_call, TALLOC_CTX *me r->out.privs->count < r->in.max_count) { struct lsa_PrivEntry *e; - r->out.privs->privs = talloc_realloc_p(r->out.privs, + r->out.privs->privs = talloc_realloc(r->out.privs, r->out.privs->privs, struct lsa_PrivEntry, r->out.privs->count+1); @@ -222,7 +222,7 @@ static NTSTATUS lsa_get_policy_state(struct dcesrv_call_state *dce_call, TALLOC_ struct lsa_policy_state *state; const char *sid_str; - state = talloc_p(mem_ctx, struct lsa_policy_state); + state = talloc(mem_ctx, struct lsa_policy_state); if (!state) { return NT_STATUS_NO_MEMORY; } @@ -410,7 +410,7 @@ static NTSTATUS lsa_QueryInfoPolicy2(struct dcesrv_call_state *dce_call, TALLOC_ state = h->data; - r->out.info = talloc_p(mem_ctx, union lsa_PolicyInformation); + r->out.info = talloc(mem_ctx, union lsa_PolicyInformation); if (!r->out.info) { return NT_STATUS_NO_MEMORY; } @@ -514,7 +514,7 @@ static NTSTATUS lsa_EnumAccounts(struct dcesrv_call_state *dce_call, TALLOC_CTX return NT_STATUS_NO_MORE_ENTRIES; } - r->out.sids->sids = talloc_array_p(r->out.sids, struct lsa_SidPtr, count); + r->out.sids->sids = talloc_array(r->out.sids, struct lsa_SidPtr, count); if (r->out.sids->sids == NULL) { return NT_STATUS_NO_MEMORY; } @@ -979,7 +979,7 @@ static NTSTATUS lsa_EnumTrustDom(struct dcesrv_call_state *dce_call, TALLOC_CTX } /* convert to lsa_DomainInformation format */ - entries = talloc_array_p(mem_ctx, struct lsa_DomainInformation, count); + entries = talloc_array(mem_ctx, struct lsa_DomainInformation, count); if (!entries) { return NT_STATUS_NO_MEMORY; } @@ -1077,7 +1077,7 @@ static NTSTATUS lsa_authority_list(struct lsa_policy_state *state, TALLOC_CTX *m } } - domains->domains = talloc_realloc_p(domains, + domains->domains = talloc_realloc(domains, domains->domains, struct lsa_TrustInformation, domains->count+1); @@ -1145,19 +1145,19 @@ static NTSTATUS lsa_LookupSids3(struct dcesrv_call_state *dce_call, return status; } - r->out.domains = talloc_zero_p(mem_ctx, struct lsa_RefDomainList); + r->out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList); if (r->out.domains == NULL) { return NT_STATUS_NO_MEMORY; } - r->out.names = talloc_zero_p(mem_ctx, struct lsa_TransNameArray2); + r->out.names = talloc_zero(mem_ctx, struct lsa_TransNameArray2); if (r->out.names == NULL) { return NT_STATUS_NO_MEMORY; } *r->out.count = 0; - r->out.names->names = talloc_array_p(r->out.names, struct lsa_TranslatedName2, + r->out.names->names = talloc_array(r->out.names, struct lsa_TranslatedName2, r->in.sids->num_sids); if (r->out.names->names == NULL) { return NT_STATUS_NO_MEMORY; @@ -1269,12 +1269,12 @@ static NTSTATUS lsa_LookupSids(struct dcesrv_call_state *dce_call, TALLOC_CTX *m } r->out.domains = r3.out.domains; - r->out.names = talloc_p(mem_ctx, struct lsa_TransNameArray); + r->out.names = talloc(mem_ctx, struct lsa_TransNameArray); if (r->out.names == NULL) { return NT_STATUS_NO_MEMORY; } r->out.names->count = r3.out.names->count; - r->out.names->names = talloc_array_p(r->out.names, struct lsa_TranslatedName, + r->out.names->names = talloc_array(r->out.names, struct lsa_TranslatedName, r->out.names->count); if (r->out.names->names == NULL) { return NT_STATUS_NO_MEMORY; @@ -1305,7 +1305,7 @@ static NTSTATUS lsa_OpenAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX * state = h->data; - astate = talloc_p(dce_call->conn, struct lsa_account_state); + astate = talloc(dce_call->conn, struct lsa_account_state); if (astate == NULL) { return NT_STATUS_NO_MEMORY; } @@ -1367,7 +1367,7 @@ static NTSTATUS lsa_EnumPrivsAccount(struct dcesrv_call_state *dce_call, astate = h->data; - r->out.privs = talloc_p(mem_ctx, struct lsa_PrivilegeSet); + r->out.privs = talloc(mem_ctx, struct lsa_PrivilegeSet); r->out.privs->count = 0; r->out.privs->unknown = 0; r->out.privs->set = NULL; @@ -1383,7 +1383,7 @@ static NTSTATUS lsa_EnumPrivsAccount(struct dcesrv_call_state *dce_call, return NT_STATUS_OK; } - r->out.privs->set = talloc_array_p(r->out.privs, + r->out.privs->set = talloc_array(r->out.privs, struct lsa_LUIDAttribute, el->num_values); if (r->out.privs->set == NULL) { return NT_STATUS_NO_MEMORY; @@ -1440,7 +1440,7 @@ static NTSTATUS lsa_EnumAccountRights(struct dcesrv_call_state *dce_call, } r->out.rights->count = el->num_values; - r->out.rights->names = talloc_array_p(r->out.rights, + r->out.rights->names = talloc_array(r->out.rights, struct lsa_String, r->out.rights->count); if (r->out.rights->names == NULL) { return NT_STATUS_NO_MEMORY; @@ -1502,7 +1502,7 @@ static NTSTATUS lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_call, r2.in.handle = &state->handle->wire_handle; r2.in.sid = sid; - r2.out.rights = talloc_p(mem_ctx, struct lsa_RightSet); + r2.out.rights = talloc(mem_ctx, struct lsa_RightSet); status = lsa_EnumAccountRights(dce_call, mem_ctx, &r2); if (!NT_STATUS_IS_OK(status)) { @@ -1511,7 +1511,7 @@ static NTSTATUS lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_call, } el.num_values = 0; - el.values = talloc_array_p(mem_ctx, struct ldb_val, rights->count); + el.values = talloc_array(mem_ctx, struct ldb_val, rights->count); if (el.values == NULL) { return NT_STATUS_NO_MEMORY; } @@ -1571,7 +1571,7 @@ static NTSTATUS lsa_AddPrivilegesToAccount(struct dcesrv_call_state *dce_call, T astate = h->data; rights.count = r->in.privs->count; - rights.names = talloc_array_p(mem_ctx, struct lsa_String, rights.count); + rights.names = talloc_array(mem_ctx, struct lsa_String, rights.count); if (rights.names == NULL) { return NT_STATUS_NO_MEMORY; } @@ -1607,7 +1607,7 @@ static NTSTATUS lsa_RemovePrivilegesFromAccount(struct dcesrv_call_state *dce_ca astate = h->data; - rights = talloc_p(mem_ctx, struct lsa_RightSet); + rights = talloc(mem_ctx, struct lsa_RightSet); if (r->in.remove_all == 1 && r->in.privs == NULL) { @@ -1633,7 +1633,7 @@ static NTSTATUS lsa_RemovePrivilegesFromAccount(struct dcesrv_call_state *dce_ca } rights->count = r->in.privs->count; - rights->names = talloc_array_p(mem_ctx, struct lsa_String, rights->count); + rights->names = talloc_array(mem_ctx, struct lsa_String, rights->count); if (rights->names == NULL) { return NT_STATUS_NO_MEMORY; } @@ -2258,7 +2258,7 @@ static NTSTATUS lsa_LookupPrivName(struct dcesrv_call_state *dce_call, return NT_STATUS_NO_SUCH_PRIVILEGE; } - r->out.name = talloc_p(mem_ctx, struct lsa_String); + r->out.name = talloc(mem_ctx, struct lsa_String); if (r->out.name == NULL) { return NT_STATUS_NO_MEMORY; } @@ -2288,7 +2288,7 @@ static NTSTATUS lsa_LookupPrivDisplayName(struct dcesrv_call_state *dce_call, return NT_STATUS_NO_SUCH_PRIVILEGE; } - r->out.disp_name = talloc_p(mem_ctx, struct lsa_String); + r->out.disp_name = talloc(mem_ctx, struct lsa_String); if (r->out.disp_name == NULL) { return NT_STATUS_NO_MEMORY; } @@ -2345,7 +2345,7 @@ static NTSTATUS lsa_EnumAccountsWithUserRight(struct dcesrv_call_state *dce_call return NT_STATUS_NO_SUCH_USER; } - r->out.sids->sids = talloc_array_p(r->out.sids, struct lsa_SidPtr, ret); + r->out.sids->sids = talloc_array(r->out.sids, struct lsa_SidPtr, ret); if (r->out.sids->sids == NULL) { return NT_STATUS_NO_MEMORY; } @@ -2464,14 +2464,14 @@ static NTSTATUS lsa_GetUserName(struct dcesrv_call_state *dce_call, TALLOC_CTX * account_name = talloc_reference(mem_ctx, dce_call->conn->auth_state.session_info->server_info->account_name); authority_name = talloc_reference(mem_ctx, dce_call->conn->auth_state.session_info->server_info->domain_name); - _account_name = talloc_p(mem_ctx, struct lsa_String); + _account_name = talloc(mem_ctx, struct lsa_String); NTSTATUS_TALLOC_CHECK(_account_name); _account_name->string = account_name; if (r->in.authority_name) { - _authority_name = talloc_p(mem_ctx, struct lsa_StringPointer); + _authority_name = talloc(mem_ctx, struct lsa_StringPointer); NTSTATUS_TALLOC_CHECK(_authority_name); - _authority_name->string = talloc_p(mem_ctx, struct lsa_String); + _authority_name->string = talloc(mem_ctx, struct lsa_String); NTSTATUS_TALLOC_CHECK(_authority_name->string); _authority_name->string->string = authority_name; } @@ -2581,19 +2581,19 @@ static NTSTATUS lsa_LookupNames3(struct dcesrv_call_state *dce_call, state = h->data; - r->out.domains = talloc_zero_p(mem_ctx, struct lsa_RefDomainList); + r->out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList); if (r->out.domains == NULL) { return NT_STATUS_NO_MEMORY; } - r->out.sids = talloc_zero_p(mem_ctx, struct lsa_TransSidArray3); + r->out.sids = talloc_zero(mem_ctx, struct lsa_TransSidArray3); if (r->out.sids == NULL) { return NT_STATUS_NO_MEMORY; } *r->out.count = 0; - r->out.sids->sids = talloc_array_p(r->out.sids, struct lsa_TranslatedSid3, + r->out.sids->sids = talloc_array(r->out.sids, struct lsa_TranslatedSid3, r->in.num_names); if (r->out.sids->sids == NULL) { return NT_STATUS_NO_MEMORY; @@ -2657,19 +2657,19 @@ static NTSTATUS lsa_LookupNames2(struct dcesrv_call_state *dce_call, state = h->data; - r->out.domains = talloc_zero_p(mem_ctx, struct lsa_RefDomainList); + r->out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList); if (r->out.domains == NULL) { return NT_STATUS_NO_MEMORY; } - r->out.sids = talloc_zero_p(mem_ctx, struct lsa_TransSidArray2); + r->out.sids = talloc_zero(mem_ctx, struct lsa_TransSidArray2); if (r->out.sids == NULL) { return NT_STATUS_NO_MEMORY; } *r->out.count = 0; - r->out.sids->sids = talloc_array_p(r->out.sids, struct lsa_TranslatedSid2, + r->out.sids->sids = talloc_array(r->out.sids, struct lsa_TranslatedSid2, r->in.num_names); if (r->out.sids->sids == NULL) { return NT_STATUS_NO_MEMORY; @@ -2741,12 +2741,12 @@ static NTSTATUS lsa_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX * } r->out.domains = r2.out.domains; - r->out.sids = talloc_p(mem_ctx, struct lsa_TransSidArray); + r->out.sids = talloc(mem_ctx, struct lsa_TransSidArray); if (r->out.sids == NULL) { return NT_STATUS_NO_MEMORY; } r->out.sids->count = r2.out.sids->count; - r->out.sids->sids = talloc_array_p(r->out.sids, struct lsa_TranslatedSid, + r->out.sids->sids = talloc_array(r->out.sids, struct lsa_TranslatedSid, r->out.sids->count); if (r->out.sids->sids == NULL) { return NT_STATUS_NO_MEMORY; diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 6ef1c66714..665d778ec9 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -45,7 +45,7 @@ static NTSTATUS netlogon_schannel_setup(struct dcesrv_call_state *dce_call) struct server_pipe_state *state; NTSTATUS status; - state = talloc_p(dce_call->conn, struct server_pipe_state); + state = talloc(dce_call->conn, struct server_pipe_state); if (state == NULL) { return NT_STATUS_NO_MEMORY; } @@ -112,7 +112,7 @@ static NTSTATUS netr_ServerReqChallenge(struct dcesrv_call_state *dce_call, TALL dce_call->context->private = NULL; } - pipe_state = talloc_p(dce_call->context, struct server_pipe_state); + pipe_state = talloc(dce_call->context, struct server_pipe_state); if (!pipe_state) { return NT_STATUS_NO_MEMORY; } @@ -213,7 +213,7 @@ static NTSTATUS netr_ServerAuthenticate3(struct dcesrv_call_state *dce_call, TAL if (pipe_state->creds) { talloc_free(pipe_state->creds); } - pipe_state->creds = talloc_p(pipe_state, struct creds_CredentialState); + pipe_state->creds = talloc(pipe_state, struct creds_CredentialState); if (!pipe_state->creds) { return NT_STATUS_NO_MEMORY; } @@ -963,7 +963,7 @@ static NTSTATUS netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_call, TALL return NT_STATUS_INTERNAL_DB_CORRUPTION; } - info1 = talloc_p(mem_ctx, struct netr_DomainInfo1); + info1 = talloc(mem_ctx, struct netr_DomainInfo1); if (info1 == NULL) { return NT_STATUS_NO_MEMORY; } @@ -971,7 +971,7 @@ static NTSTATUS netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_call, TALL ZERO_STRUCTP(info1); info1->num_trusts = ret2 + 1; - info1->trusts = talloc_array_p(mem_ctx, struct netr_DomainTrustInfo, + info1->trusts = talloc_array(mem_ctx, struct netr_DomainTrustInfo, info1->num_trusts); if (info1->trusts == NULL) { return NT_STATUS_NO_MEMORY; @@ -1169,7 +1169,7 @@ static WERROR netr_DrsGetDCNameEx2(struct dcesrv_call_state *dce_call, TALLOC_CT return WERR_NO_SUCH_DOMAIN; } - r->out.info = talloc_p(mem_ctx, struct netr_DrsGetDCNameEx2Info); + r->out.info = talloc(mem_ctx, struct netr_DrsGetDCNameEx2Info); if (!r->out.info) { return WERR_NOMEM; } @@ -1259,7 +1259,7 @@ static WERROR netr_DsrEnumerateDomainTrusts(struct dcesrv_call_state *dce_call, return WERR_OK; } - trusts = talloc_array_p(mem_ctx, struct netr_DomainTrust, ret); + trusts = talloc_array(mem_ctx, struct netr_DomainTrust, ret); if (trusts == NULL) { return WERR_NOMEM; } diff --git a/source4/rpc_server/netlogon/schannel_state.c b/source4/rpc_server/netlogon/schannel_state.c index 56f7152c14..a0bffcce06 100644 --- a/source4/rpc_server/netlogon/schannel_state.c +++ b/source4/rpc_server/netlogon/schannel_state.c @@ -154,7 +154,7 @@ NTSTATUS schannel_fetch_session_key(TALLOC_CTX *mem_ctx, const struct ldb_val *val; char *expr=NULL; - *creds = talloc_zero_p(mem_ctx, struct creds_CredentialState); + *creds = talloc_zero(mem_ctx, struct creds_CredentialState); if (!*creds) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c index 1464ef0307..b1e9659198 100644 --- a/source4/rpc_server/remote/dcesrv_remote.c +++ b/source4/rpc_server/remote/dcesrv_remote.c @@ -37,7 +37,7 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct return NT_STATUS_INVALID_PARAMETER; } - private = talloc_p(dce_call->conn, struct dcesrv_remote_private); + private = talloc(dce_call->conn, struct dcesrv_remote_private); if (!private) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index c3ec8bf80f..0bc44c410b 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -53,7 +53,7 @@ static NTSTATUS samr_Connect(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem ZERO_STRUCTP(r->out.connect_handle); - c_state = talloc_p(dce_call->conn, struct samr_connect_state); + c_state = talloc(dce_call->conn, struct samr_connect_state); if (!c_state) { return NT_STATUS_NO_MEMORY; } @@ -123,7 +123,7 @@ static NTSTATUS samr_QuerySecurity(struct dcesrv_call_state *dce_call, TALLOC_CT DCESRV_PULL_HANDLE(h, r->in.handle, DCESRV_HANDLE_ANY); - sd = talloc_p(mem_ctx, struct sec_desc_buf); + sd = talloc(mem_ctx, struct sec_desc_buf); if (sd == NULL) { return NT_STATUS_NO_MEMORY; } @@ -232,7 +232,7 @@ static NTSTATUS samr_EnumDomains(struct dcesrv_call_state *dce_call, TALLOC_CTX return NT_STATUS_OK; } - array = talloc_p(mem_ctx, struct samr_SamArray); + array = talloc(mem_ctx, struct samr_SamArray); if (array == NULL) { return NT_STATUS_NO_MEMORY; } @@ -240,7 +240,7 @@ static NTSTATUS samr_EnumDomains(struct dcesrv_call_state *dce_call, TALLOC_CTX array->count = 0; array->entries = NULL; - array->entries = talloc_array_p(mem_ctx, struct samr_SamEntry, count - start_i); + array->entries = talloc_array(mem_ctx, struct samr_SamEntry, count - start_i); if (array->entries == NULL) { return NT_STATUS_NO_MEMORY; } @@ -300,7 +300,7 @@ static NTSTATUS samr_OpenDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX * return NT_STATUS_NO_SUCH_DOMAIN; } - d_state = talloc_p(c_state, struct samr_domain_state); + d_state = talloc(c_state, struct samr_domain_state); if (!d_state) { return NT_STATUS_NO_MEMORY; } @@ -426,7 +426,7 @@ static NTSTATUS samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_ d_state = h->data; - r->out.info = talloc_p(mem_ctx, union samr_DomainInfo); + r->out.info = talloc(mem_ctx, union samr_DomainInfo); if (!r->out.info) { return NT_STATUS_NO_MEMORY; } @@ -541,7 +541,7 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO return NT_STATUS_INTERNAL_DB_CORRUPTION; } - a_state = talloc_p(d_state, struct samr_account_state); + a_state = talloc(d_state, struct samr_account_state); if (!a_state) { return NT_STATUS_NO_MEMORY; } @@ -620,7 +620,7 @@ static NTSTATUS samr_EnumDomainGroups(struct dcesrv_call_state *dce_call, TALLOC } /* convert to SamEntry format */ - entries = talloc_array_p(mem_ctx, struct samr_SamEntry, ldb_cnt); + entries = talloc_array(mem_ctx, struct samr_SamEntry, ldb_cnt); if (!entries) { return NT_STATUS_NO_MEMORY; } @@ -661,7 +661,7 @@ static NTSTATUS samr_EnumDomainGroups(struct dcesrv_call_state *dce_call, TALLOC r->out.num_entries = MIN(r->out.num_entries, 1+(r->in.max_size/SAMR_ENUM_USERS_MULTIPLIER)); - r->out.sam = talloc_p(mem_ctx, struct samr_SamArray); + r->out.sam = talloc(mem_ctx, struct samr_SamArray); if (!r->out.sam) { return NT_STATUS_NO_MEMORY; } @@ -811,7 +811,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX return NT_STATUS_INTERNAL_DB_CORRUPTION; } - a_state = talloc_p(d_state, struct samr_account_state); + a_state = talloc(d_state, struct samr_account_state); if (!a_state) { return NT_STATUS_NO_MEMORY; } @@ -896,7 +896,7 @@ static NTSTATUS samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, TALLOC_ } /* convert to SamEntry format */ - entries = talloc_array_p(mem_ctx, struct samr_SamEntry, count); + entries = talloc_array(mem_ctx, struct samr_SamEntry, count); if (!entries) { return NT_STATUS_NO_MEMORY; } @@ -924,7 +924,7 @@ static NTSTATUS samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, TALLOC_ r->out.num_entries = MIN(r->out.num_entries, 1+(r->in.max_size/SAMR_ENUM_USERS_MULTIPLIER)); - r->out.sam = talloc_p(mem_ctx, struct samr_SamArray); + r->out.sam = talloc(mem_ctx, struct samr_SamArray); if (!r->out.sam) { return NT_STATUS_NO_MEMORY; } @@ -1027,7 +1027,7 @@ static NTSTATUS samr_CreateDomAlias(struct dcesrv_call_state *dce_call, TALLOC_C return NT_STATUS_INTERNAL_DB_CORRUPTION; } - a_state = talloc_p(d_state, struct samr_account_state); + a_state = talloc(d_state, struct samr_account_state); if (!a_state) { return NT_STATUS_NO_MEMORY; } @@ -1101,7 +1101,7 @@ static NTSTATUS samr_EnumDomainAliases(struct dcesrv_call_state *dce_call, TALLO } /* convert to SamEntry format */ - entries = talloc_array_p(mem_ctx, struct samr_SamEntry, ldb_cnt); + entries = talloc_array(mem_ctx, struct samr_SamEntry, ldb_cnt); if (!entries) { return NT_STATUS_NO_MEMORY; } @@ -1140,7 +1140,7 @@ static NTSTATUS samr_EnumDomainAliases(struct dcesrv_call_state *dce_call, TALLO r->out.num_entries = count - first; r->out.num_entries = MIN(r->out.num_entries, 1000); - r->out.sam = talloc_p(mem_ctx, struct samr_SamArray); + r->out.sam = talloc(mem_ctx, struct samr_SamArray); if (!r->out.sam) { return NT_STATUS_NO_MEMORY; } @@ -1223,7 +1223,7 @@ static NTSTATUS samr_GetAliasMembership(struct dcesrv_call_state *dce_call, TALL } r->out.rids->count = 0; - r->out.rids->ids = talloc_array_p(mem_ctx, uint32_t, count); + r->out.rids->ids = talloc_array(mem_ctx, uint32_t, count); if (r->out.rids->ids == NULL) return NT_STATUS_NO_MEMORY; @@ -1270,8 +1270,8 @@ static NTSTATUS samr_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX return NT_STATUS_OK; } - r->out.rids.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names); - r->out.types.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names); + r->out.rids.ids = talloc_array(mem_ctx, uint32_t, r->in.num_names); + r->out.types.ids = talloc_array(mem_ctx, uint32_t, r->in.num_names); if (!r->out.rids.ids || !r->out.types.ids) { return NT_STATUS_NO_MEMORY; } @@ -1351,8 +1351,8 @@ static NTSTATUS samr_LookupRids(struct dcesrv_call_state *dce_call, TALLOC_CTX * if (r->in.num_rids == 0) return NT_STATUS_OK; - names = talloc_array_p(mem_ctx, struct samr_String, r->in.num_rids); - ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_rids); + names = talloc_array(mem_ctx, struct samr_String, r->in.num_rids); + ids = talloc_array(mem_ctx, uint32_t, r->in.num_rids); if ((names == NULL) || (ids == NULL)) return NT_STATUS_NO_MEMORY; @@ -1450,7 +1450,7 @@ static NTSTATUS samr_OpenGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *m return NT_STATUS_INTERNAL_DB_CORRUPTION; } - a_state = talloc_p(d_state, struct samr_account_state); + a_state = talloc(d_state, struct samr_account_state); if (!a_state) { return NT_STATUS_NO_MEMORY; } @@ -1554,7 +1554,7 @@ static NTSTATUS samr_QueryGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_C msg = res[0]; /* allocate the info structure */ - r->out.info = talloc_p(mem_ctx, union samr_GroupInfo); + r->out.info = talloc(mem_ctx, union samr_GroupInfo); if (r->out.info == NULL) { return NT_STATUS_NO_MEMORY; } @@ -1813,7 +1813,7 @@ static NTSTATUS samr_QueryGroupMember(struct dcesrv_call_state *dce_call, TALLOC return NT_STATUS_INTERNAL_DB_CORRUPTION; } - array = talloc_p(mem_ctx, struct samr_ridArray); + array = talloc(mem_ctx, struct samr_ridArray); if (array == NULL) return NT_STATUS_NO_MEMORY; @@ -1827,12 +1827,12 @@ static NTSTATUS samr_QueryGroupMember(struct dcesrv_call_state *dce_call, TALLOC array->count = el->num_values; - array->rids = talloc_array_p(mem_ctx, uint32, + array->rids = talloc_array(mem_ctx, uint32, el->num_values); if (array->rids == NULL) return NT_STATUS_NO_MEMORY; - array->unknown = talloc_array_p(mem_ctx, uint32, + array->unknown = talloc_array(mem_ctx, uint32, el->num_values); if (array->unknown == NULL) return NT_STATUS_NO_MEMORY; @@ -1924,7 +1924,7 @@ static NTSTATUS samr_OpenAlias(struct dcesrv_call_state *dce_call, TALLOC_CTX *m return NT_STATUS_INTERNAL_DB_CORRUPTION; } - a_state = talloc_p(d_state, struct samr_account_state); + a_state = talloc(d_state, struct samr_account_state); if (!a_state) { return NT_STATUS_NO_MEMORY; } @@ -1980,7 +1980,7 @@ static NTSTATUS samr_QueryAliasInfo(struct dcesrv_call_state *dce_call, TALLOC_C msg = res[0]; /* allocate the info structure */ - r->out.info = talloc_p(mem_ctx, union samr_AliasInfo); + r->out.info = talloc(mem_ctx, union samr_AliasInfo); if (r->out.info == NULL) { return NT_STATUS_NO_MEMORY; } @@ -2282,7 +2282,7 @@ static NTSTATUS samr_GetMembersInAlias(struct dcesrv_call_state *dce_call, TALLO if (el != NULL) { int i; - sids = talloc_array_p(mem_ctx, struct lsa_SidPtr, + sids = talloc_array(mem_ctx, struct lsa_SidPtr, el->num_values); if (sids == NULL) @@ -2356,7 +2356,7 @@ static NTSTATUS samr_OpenUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *me return NT_STATUS_INTERNAL_DB_CORRUPTION; } - a_state = talloc_p(mem_ctx, struct samr_account_state); + a_state = talloc(mem_ctx, struct samr_account_state); if (!a_state) { return NT_STATUS_NO_MEMORY; } @@ -2438,7 +2438,7 @@ static NTSTATUS samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CT msg = res[0]; /* allocate the info structure */ - r->out.info = talloc_p(mem_ctx, union samr_UserInfo); + r->out.info = talloc(mem_ctx, union samr_UserInfo); if (r->out.info == NULL) { return NT_STATUS_NO_MEMORY; } @@ -2858,7 +2858,7 @@ static NTSTATUS samr_GetGroupsForUser(struct dcesrv_call_state *dce_call, TALLOC if (count < 0) return NT_STATUS_INTERNAL_DB_CORRUPTION; - array = talloc_p(mem_ctx, struct samr_RidArray); + array = talloc(mem_ctx, struct samr_RidArray); if (array == NULL) return NT_STATUS_NO_MEMORY; @@ -2867,7 +2867,7 @@ static NTSTATUS samr_GetGroupsForUser(struct dcesrv_call_state *dce_call, TALLOC if (count > 0) { int i; - array->rid = talloc_array_p(mem_ctx, struct samr_RidType, + array->rid = talloc_array(mem_ctx, struct samr_RidType, count); if (array->rid == NULL) @@ -2960,19 +2960,19 @@ static NTSTATUS samr_QueryDisplayInfo(struct dcesrv_call_state *dce_call, TALLOC switch (r->in.level) { case 1: - entriesGeneral = talloc_array_p(mem_ctx, + entriesGeneral = talloc_array(mem_ctx, struct samr_DispEntryGeneral, ldb_cnt); break; case 2: case 3: - entriesFull = talloc_array_p(mem_ctx, + entriesFull = talloc_array(mem_ctx, struct samr_DispEntryFull, ldb_cnt); break; case 4: case 5: - entriesAscii = talloc_array_p(mem_ctx, + entriesAscii = talloc_array(mem_ctx, struct samr_DispEntryAscii, ldb_cnt); break; diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c index 085fe450ac..ae20de1623 100644 --- a/source4/rpc_server/samr/samr_password.c +++ b/source4/rpc_server/samr/samr_password.c @@ -408,11 +408,11 @@ failed: } /* on failure we need to fill in the reject reasons */ - dominfo = talloc_p(mem_ctx, struct samr_DomInfo1); + dominfo = talloc(mem_ctx, struct samr_DomInfo1); if (dominfo == NULL) { return status; } - reject = talloc_p(mem_ctx, struct samr_ChangeReject); + reject = talloc(mem_ctx, struct samr_ChangeReject); if (reject == NULL) { return status; } @@ -683,12 +683,12 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx, } /* store the password history */ - new_lmPwdHistory = talloc_array_p(mem_ctx, struct samr_Password, + new_lmPwdHistory = talloc_array(mem_ctx, struct samr_Password, pwdHistoryLength); if (!new_lmPwdHistory) { return NT_STATUS_NO_MEMORY; } - new_ntPwdHistory = talloc_array_p(mem_ctx, struct samr_Password, + new_ntPwdHistory = talloc_array(mem_ctx, struct samr_Password, pwdHistoryLength); if (!new_ntPwdHistory) { return NT_STATUS_NO_MEMORY; diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c b/source4/rpc_server/spoolss/dcesrv_spoolss.c index ff0a5641b7..8bb6a5c60f 100644 --- a/source4/rpc_server/spoolss/dcesrv_spoolss.c +++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c @@ -33,7 +33,7 @@ static WERROR spoolss_EnumPrinters1(TALLOC_CTX *mem_ctx, struct spoolss_PrinterInfo1 *info; int i; - info = talloc_array_p(mem_ctx, struct spoolss_PrinterInfo1, num_msgs); + info = talloc_array(mem_ctx, struct spoolss_PrinterInfo1, num_msgs); if (!info) return WERR_NOMEM; @@ -59,7 +59,7 @@ static WERROR spoolss_EnumPrinters2(TALLOC_CTX *mem_ctx, struct spoolss_PrinterInfo2 *info; int i; - info = talloc_array_p(mem_ctx, struct spoolss_PrinterInfo2, num_msgs); + info = talloc_array(mem_ctx, struct spoolss_PrinterInfo2, num_msgs); if (!info) return WERR_NOMEM; @@ -102,7 +102,7 @@ static WERROR spoolss_EnumPrinters5(TALLOC_CTX *mem_ctx, struct spoolss_PrinterInfo5 *info; int i; - info = talloc_array_p(mem_ctx, struct spoolss_PrinterInfo5, num_msgs); + info = talloc_array(mem_ctx, struct spoolss_PrinterInfo5, num_msgs); if (!info) return WERR_NOMEM; @@ -168,7 +168,7 @@ static WERROR spoolss_EnumPrinters(struct dcesrv_call_state *dce_call, TALLOC_CT goto done; } - r->out.buffer = talloc_p(mem_ctx, DATA_BLOB); + r->out.buffer = talloc(mem_ctx, DATA_BLOB); if (!r->out.buffer) { result = WERR_NOMEM; @@ -893,7 +893,7 @@ static WERROR spoolss_OpenPrinterEx_server(struct dcesrv_call_state *dce_call, return WERR_NOMEM; } - state = talloc_p(handle, struct spoolss_openprinter_state); + state = talloc(handle, struct spoolss_openprinter_state); if (!state) { return WERR_OK; } diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c index 57afa4530e..3362d2f4d1 100644 --- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c +++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c @@ -38,7 +38,7 @@ static WERROR srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, TALLOC_C switch (r->in.level) { case 0: - r->out.ctr.ctr0 = talloc_p(mem_ctx, struct srvsvc_NetCharDevCtr0); + r->out.ctr.ctr0 = talloc(mem_ctx, struct srvsvc_NetCharDevCtr0); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr0); r->out.ctr.ctr0->count = 0; @@ -47,7 +47,7 @@ static WERROR srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, TALLOC_C return WERR_NOT_SUPPORTED; case 1: - r->out.ctr.ctr1 = talloc_p(mem_ctx, struct srvsvc_NetCharDevCtr1); + r->out.ctr.ctr1 = talloc(mem_ctx, struct srvsvc_NetCharDevCtr1); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr1); r->out.ctr.ctr1->count = 0; @@ -111,7 +111,7 @@ static WERROR srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLOC_ switch (r->in.level) { case 0: { - r->out.ctr.ctr0 = talloc_p(mem_ctx, struct srvsvc_NetCharDevQCtr0); + r->out.ctr.ctr0 = talloc(mem_ctx, struct srvsvc_NetCharDevQCtr0); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr0); r->out.ctr.ctr0->count = 0; @@ -121,7 +121,7 @@ static WERROR srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLOC_ } case 1: { - r->out.ctr.ctr1 = talloc_p(mem_ctx, struct srvsvc_NetCharDevQCtr1); + r->out.ctr.ctr1 = talloc(mem_ctx, struct srvsvc_NetCharDevQCtr1); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr1); r->out.ctr.ctr1->count = 0; @@ -224,7 +224,7 @@ static WERROR srvsvc_NetConnEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX switch (r->in.level) { case 0: { - r->out.ctr.ctr0 = talloc_p(mem_ctx, struct srvsvc_NetConnCtr0); + r->out.ctr.ctr0 = talloc(mem_ctx, struct srvsvc_NetConnCtr0); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr0); r->out.ctr.ctr0->count = 0; @@ -234,7 +234,7 @@ static WERROR srvsvc_NetConnEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX } case 1: { - r->out.ctr.ctr1 = talloc_p(mem_ctx, struct srvsvc_NetConnCtr1); + r->out.ctr.ctr1 = talloc(mem_ctx, struct srvsvc_NetConnCtr1); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr1); r->out.ctr.ctr1->count = 0; @@ -263,7 +263,7 @@ static WERROR srvsvc_NetFileEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX switch (r->in.level) { case 2: { - r->out.ctr.ctr2 = talloc_p(mem_ctx, struct srvsvc_NetFileCtr2); + r->out.ctr.ctr2 = talloc(mem_ctx, struct srvsvc_NetFileCtr2); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr2); r->out.ctr.ctr2->count = 0; @@ -273,7 +273,7 @@ static WERROR srvsvc_NetFileEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX } case 3: { - r->out.ctr.ctr3 = talloc_p(mem_ctx, struct srvsvc_NetFileCtr3); + r->out.ctr.ctr3 = talloc(mem_ctx, struct srvsvc_NetFileCtr3); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr3); r->out.ctr.ctr3->count = 0; @@ -337,7 +337,7 @@ static WERROR srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX switch (r->in.level) { case 0: { - r->out.ctr.ctr0 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr0); + r->out.ctr.ctr0 = talloc(mem_ctx, struct srvsvc_NetSessCtr0); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr0); r->out.ctr.ctr0->count = 0; @@ -347,7 +347,7 @@ static WERROR srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX } case 1: { - r->out.ctr.ctr1 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr1); + r->out.ctr.ctr1 = talloc(mem_ctx, struct srvsvc_NetSessCtr1); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr1); r->out.ctr.ctr1->count = 0; @@ -357,7 +357,7 @@ static WERROR srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX } case 2: { - r->out.ctr.ctr2 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr2); + r->out.ctr.ctr2 = talloc(mem_ctx, struct srvsvc_NetSessCtr2); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr2); r->out.ctr.ctr2->count = 0; @@ -367,7 +367,7 @@ static WERROR srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX } case 10: { - r->out.ctr.ctr10 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr10); + r->out.ctr.ctr10 = talloc(mem_ctx, struct srvsvc_NetSessCtr10); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr10); r->out.ctr.ctr2->count = 0; @@ -377,7 +377,7 @@ static WERROR srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX } case 502: { - r->out.ctr.ctr502 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr502); + r->out.ctr.ctr502 = talloc(mem_ctx, struct srvsvc_NetSessCtr502); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr502); r->out.ctr.ctr2->count = 0; @@ -556,7 +556,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ int i; struct srvsvc_NetShareCtr0 *ctr0; - ctr0 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr0); + ctr0 = talloc(mem_ctx, struct srvsvc_NetShareCtr0); W_ERROR_HAVE_NO_MEMORY(ctr0); ctr0->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -567,7 +567,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ return WERR_OK; } - ctr0->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo0, ctr0->count); + ctr0->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo0, ctr0->count); W_ERROR_HAVE_NO_MEMORY(ctr0->array); for (i=0; i < ctr0->count; i++) { @@ -590,7 +590,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ int i; struct srvsvc_NetShareCtr1 *ctr1; - ctr1 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr1); + ctr1 = talloc(mem_ctx, struct srvsvc_NetShareCtr1); W_ERROR_HAVE_NO_MEMORY(ctr1); ctr1->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -601,7 +601,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ return WERR_OK; } - ctr1->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo1, ctr1->count); + ctr1->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo1, ctr1->count); W_ERROR_HAVE_NO_MEMORY(ctr1->array); for (i=0; i < ctr1->count; i++) { @@ -624,7 +624,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ int i; struct srvsvc_NetShareCtr2 *ctr2; - ctr2 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr2); + ctr2 = talloc(mem_ctx, struct srvsvc_NetShareCtr2); W_ERROR_HAVE_NO_MEMORY(ctr2); ctr2->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -635,7 +635,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ return WERR_OK; } - ctr2->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo2, ctr2->count); + ctr2->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo2, ctr2->count); W_ERROR_HAVE_NO_MEMORY(ctr2->array); for (i=0; i < ctr2->count; i++) { @@ -658,7 +658,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ int i; struct srvsvc_NetShareCtr501 *ctr501; - ctr501 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr501); + ctr501 = talloc(mem_ctx, struct srvsvc_NetShareCtr501); W_ERROR_HAVE_NO_MEMORY(ctr501); ctr501->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -669,7 +669,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ return WERR_OK; } - ctr501->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo501, ctr501->count); + ctr501->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo501, ctr501->count); W_ERROR_HAVE_NO_MEMORY(ctr501->array); for (i=0; i < ctr501->count; i++) { @@ -692,7 +692,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ int i; struct srvsvc_NetShareCtr502 *ctr502; - ctr502 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr502); + ctr502 = talloc(mem_ctx, struct srvsvc_NetShareCtr502); W_ERROR_HAVE_NO_MEMORY(ctr502); ctr502->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -703,7 +703,7 @@ static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_ return WERR_OK; } - ctr502->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo502, ctr502->count); + ctr502->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo502, ctr502->count); W_ERROR_HAVE_NO_MEMORY(ctr502->array); for (i=0; i < ctr502->count; i++) { @@ -757,7 +757,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_ WERROR status; union srvsvc_NetShareInfo info; - info.info0 = talloc_p(mem_ctx, struct srvsvc_NetShareInfo0); + info.info0 = talloc(mem_ctx, struct srvsvc_NetShareInfo0); W_ERROR_HAVE_NO_MEMORY(info.info0); status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, snum, r->in.level, &info); @@ -773,7 +773,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_ WERROR status; union srvsvc_NetShareInfo info; - info.info1 = talloc_p(mem_ctx, struct srvsvc_NetShareInfo1); + info.info1 = talloc(mem_ctx, struct srvsvc_NetShareInfo1); W_ERROR_HAVE_NO_MEMORY(info.info1); status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, snum, r->in.level, &info); @@ -789,7 +789,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_ WERROR status; union srvsvc_NetShareInfo info; - info.info2 = talloc_p(mem_ctx, struct srvsvc_NetShareInfo2); + info.info2 = talloc(mem_ctx, struct srvsvc_NetShareInfo2); W_ERROR_HAVE_NO_MEMORY(info.info2); status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, snum, r->in.level, &info); @@ -805,7 +805,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_ WERROR status; union srvsvc_NetShareInfo info; - info.info501 = talloc_p(mem_ctx, struct srvsvc_NetShareInfo501); + info.info501 = talloc(mem_ctx, struct srvsvc_NetShareInfo501); W_ERROR_HAVE_NO_MEMORY(info.info501); status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, snum, r->in.level, &info); @@ -821,7 +821,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_ WERROR status; union srvsvc_NetShareInfo info; - info.info502 = talloc_p(mem_ctx, struct srvsvc_NetShareInfo502); + info.info502 = talloc(mem_ctx, struct srvsvc_NetShareInfo502); W_ERROR_HAVE_NO_MEMORY(info.info502); status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, snum, r->in.level, &info); @@ -837,7 +837,7 @@ static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_ WERROR status; union srvsvc_NetShareInfo info; - info.info1005 = talloc_p(mem_ctx, struct srvsvc_NetShareInfo1005); + info.info1005 = talloc(mem_ctx, struct srvsvc_NetShareInfo1005); W_ERROR_HAVE_NO_MEMORY(info.info1005); status = srvsvc_fiel_ShareInfo(dce_call, mem_ctx, snum, r->in.level, &info); @@ -927,7 +927,7 @@ static WERROR srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CT { struct srvsvc_NetSrvInfo100 *info100; - info100 = talloc_p(mem_ctx, struct srvsvc_NetSrvInfo100); + info100 = talloc(mem_ctx, struct srvsvc_NetSrvInfo100); W_ERROR_HAVE_NO_MEMORY(info100); info100->platform_id = dcesrv_common_get_platform_id(mem_ctx, dce_ctx); @@ -941,7 +941,7 @@ static WERROR srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CT { struct srvsvc_NetSrvInfo101 *info101; - info101 = talloc_p(mem_ctx, struct srvsvc_NetSrvInfo101); + info101 = talloc(mem_ctx, struct srvsvc_NetSrvInfo101); W_ERROR_HAVE_NO_MEMORY(info101); info101->platform_id = dcesrv_common_get_platform_id(mem_ctx, dce_ctx); @@ -989,7 +989,7 @@ static WERROR srvsvc_NetDiskEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX switch (r->in.level) { case 0: { - r->out.ctr0 = talloc_p(mem_ctx, struct srvsvc_NetDiskCtr0); + r->out.ctr0 = talloc(mem_ctx, struct srvsvc_NetDiskCtr0); W_ERROR_HAVE_NO_MEMORY(r->out.ctr0); r->out.ctr0->unknown = 0x1; @@ -1039,7 +1039,7 @@ static WERROR srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALLOC switch (r->in.level) { case 0: { - r->out.ctr.ctr0 = talloc_p(mem_ctx, struct srvsvc_NetTransportCtr0); + r->out.ctr.ctr0 = talloc(mem_ctx, struct srvsvc_NetTransportCtr0); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr0); r->out.ctr.ctr0->count = 0; @@ -1049,7 +1049,7 @@ static WERROR srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALLOC } case 1: { - r->out.ctr.ctr1 = talloc_p(mem_ctx, struct srvsvc_NetTransportCtr1); + r->out.ctr.ctr1 = talloc(mem_ctx, struct srvsvc_NetTransportCtr1); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr1); r->out.ctr.ctr1->count = 0; @@ -1059,7 +1059,7 @@ static WERROR srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALLOC } case 2: { - r->out.ctr.ctr2 = talloc_p(mem_ctx, struct srvsvc_NetTransportCtr2); + r->out.ctr.ctr2 = talloc(mem_ctx, struct srvsvc_NetTransportCtr2); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr2); r->out.ctr.ctr2->count = 0; @@ -1069,7 +1069,7 @@ static WERROR srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALLOC } case 3: { - r->out.ctr.ctr3 = talloc_p(mem_ctx, struct srvsvc_NetTransportCtr3); + r->out.ctr.ctr3 = talloc(mem_ctx, struct srvsvc_NetTransportCtr3); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr3); r->out.ctr.ctr3->count = 0; @@ -1105,7 +1105,7 @@ static WERROR srvsvc_NetRemoteTOD(struct dcesrv_call_state *dce_call, TALLOC_CTX time_t t; struct tm tm; - r->out.info = talloc_p(mem_ctx, struct srvsvc_NetRemoteTODInfo); + r->out.info = talloc(mem_ctx, struct srvsvc_NetRemoteTODInfo); W_ERROR_HAVE_NO_MEMORY(r->out.info); GetTimeOfDay(&tval); @@ -1228,7 +1228,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX uint32_t count; struct srvsvc_NetShareCtr0 *ctr0; - ctr0 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr0); + ctr0 = talloc(mem_ctx, struct srvsvc_NetShareCtr0); W_ERROR_HAVE_NO_MEMORY(ctr0); ctr0->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -1239,7 +1239,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX return WERR_OK; } - ctr0->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo0, ctr0->count); + ctr0->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo0, ctr0->count); W_ERROR_HAVE_NO_MEMORY(ctr0->array); count = ctr0->count; @@ -1269,7 +1269,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX uint32_t count; struct srvsvc_NetShareCtr1 *ctr1; - ctr1 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr1); + ctr1 = talloc(mem_ctx, struct srvsvc_NetShareCtr1); W_ERROR_HAVE_NO_MEMORY(ctr1); ctr1->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -1280,7 +1280,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX return WERR_OK; } - ctr1->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo1, ctr1->count); + ctr1->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo1, ctr1->count); W_ERROR_HAVE_NO_MEMORY(ctr1->array); count = ctr1->count; @@ -1310,7 +1310,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX uint32_t count; struct srvsvc_NetShareCtr2 *ctr2; - ctr2 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr2); + ctr2 = talloc(mem_ctx, struct srvsvc_NetShareCtr2); W_ERROR_HAVE_NO_MEMORY(ctr2); ctr2->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -1321,7 +1321,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX return WERR_OK; } - ctr2->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo2, ctr2->count); + ctr2->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo2, ctr2->count); W_ERROR_HAVE_NO_MEMORY(ctr2->array); count = ctr2->count; @@ -1351,7 +1351,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX uint32_t count; struct srvsvc_NetShareCtr501 *ctr501; - ctr501 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr501); + ctr501 = talloc(mem_ctx, struct srvsvc_NetShareCtr501); W_ERROR_HAVE_NO_MEMORY(ctr501); ctr501->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -1362,7 +1362,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX return WERR_OK; } - ctr501->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo501, ctr501->count); + ctr501->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo501, ctr501->count); W_ERROR_HAVE_NO_MEMORY(ctr501->array); count = ctr501->count; @@ -1392,7 +1392,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX uint32_t count; struct srvsvc_NetShareCtr502 *ctr502; - ctr502 = talloc_p(mem_ctx, struct srvsvc_NetShareCtr502); + ctr502 = talloc(mem_ctx, struct srvsvc_NetShareCtr502); W_ERROR_HAVE_NO_MEMORY(ctr502); ctr502->count = dcesrv_common_get_count_of_shares(mem_ctx, dce_ctx); @@ -1403,7 +1403,7 @@ static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX return WERR_OK; } - ctr502->array = talloc_array_p(mem_ctx, struct srvsvc_NetShareInfo502, ctr502->count); + ctr502->array = talloc_array(mem_ctx, struct srvsvc_NetShareInfo502, ctr502->count); W_ERROR_HAVE_NO_MEMORY(ctr502->array); count = ctr502->count; diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c index 58bee5e18b..c0da3cbb11 100644 --- a/source4/rpc_server/winreg/rpc_winreg.c +++ b/source4/rpc_server/winreg/rpc_winreg.c @@ -167,10 +167,10 @@ static WERROR winreg_EnumKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem if (W_ERROR_IS_OK(r->out.result)) { r->out.key_name_len = strlen(key->name); - r->out.out_name = talloc_zero_p(mem_ctx, struct winreg_EnumKeyNameResponse); + r->out.out_name = talloc_zero(mem_ctx, struct winreg_EnumKeyNameResponse); r->out.out_name->name = key->name; - r->out.class = talloc_zero_p(mem_ctx, struct winreg_String); - r->out.last_changed_time = talloc_zero_p(mem_ctx, struct winreg_Time); + r->out.class = talloc_zero(mem_ctx, struct winreg_String); + r->out.last_changed_time = talloc_zero(mem_ctx, struct winreg_Time); } return r->out.result; @@ -197,11 +197,11 @@ static WERROR winreg_EnumValue(struct dcesrv_call_state *dce_call, TALLOC_CTX *m return result; } - r->out.type = talloc_p(mem_ctx, uint32_t); + r->out.type = talloc(mem_ctx, uint32_t); *r->out.type = value->data_type; r->out.name_out.name = value->name; r->out.value = value->data_blk; - r->out.size = talloc_p(mem_ctx, uint32_t); + r->out.size = talloc(mem_ctx, uint32_t); r->out.length = r->out.size; *r->out.size = value->data_len; @@ -353,7 +353,7 @@ static WERROR winreg_QueryValue(struct dcesrv_call_state *dce_call, TALLOC_CTX * r->out.type = &val->data_type; r->out.length = &val->data_len; if (!r->in.data) { - r->out.size = talloc_p(mem_ctx, uint32); + r->out.size = talloc(mem_ctx, uint32); *r->out.size = val->data_len; } else { r->out.size = r->in.size; diff --git a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c index 82de29e44e..793b86d9dc 100644 --- a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c +++ b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c @@ -42,7 +42,7 @@ static WERROR wkssvc_NetWkstaGetInfo(struct dcesrv_call_state *dce_call, TALLOC_ { struct wkssvc_NetWkstaInfo100 *info100; - info100 = talloc_p(mem_ctx, struct wkssvc_NetWkstaInfo100); + info100 = talloc(mem_ctx, struct wkssvc_NetWkstaInfo100); W_ERROR_HAVE_NO_MEMORY(info100); info100->platform_id = dcesrv_common_get_platform_id(mem_ctx, dce_ctx); @@ -60,7 +60,7 @@ static WERROR wkssvc_NetWkstaGetInfo(struct dcesrv_call_state *dce_call, TALLOC_ { struct wkssvc_NetWkstaInfo101 *info101; - info101 = talloc_p(mem_ctx, struct wkssvc_NetWkstaInfo101); + info101 = talloc(mem_ctx, struct wkssvc_NetWkstaInfo101); W_ERROR_HAVE_NO_MEMORY(info101); info101->platform_id = dcesrv_common_get_platform_id(mem_ctx, dce_ctx); @@ -143,7 +143,7 @@ static WERROR wkssvc_NetWkstaTransportEnum(struct dcesrv_call_state *dce_call, T switch (r->in.level) { case 0: - r->out.ctr.ctr0 = talloc_p(mem_ctx, struct wkssvc_NetWkstaTransportCtr0); + r->out.ctr.ctr0 = talloc(mem_ctx, struct wkssvc_NetWkstaTransportCtr0); W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr0); r->out.ctr.ctr0->count = 0; -- cgit