Author: jelmer Date: 2008-01-05 15:36:33 +0000 (Sat, 05 Jan 2008) New Revision: 26669
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26669 Log: Janitorial: Remove uses of global_loadparm. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/ldap_server/ldap_server.c branches/SAMBA_4_0/source/ldap_server/ldap_server.h branches/SAMBA_4_0/source/lib/events/events.c branches/SAMBA_4_0/source/libcli/raw/clisocket.c branches/SAMBA_4_0/source/libcli/raw/rawacl.c branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c branches/SAMBA_4_0/source/libnet/libnet_become_dc.c branches/SAMBA_4_0/source/libnet/libnet_vampire.c branches/SAMBA_4_0/source/wrepl_server/wrepl_in_connection.c Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.c =================================================================== --- branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2008-01-05 15:36:26 UTC (rev 26668) +++ branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2008-01-05 15:36:33 UTC (rev 26669) @@ -345,7 +345,7 @@ conn->connection = c; conn->service = ldapsrv_service; conn->sockets.raw = c->socket; - conn->lp_ctx = global_loadparm; + conn->lp_ctx = ldapsrv_service->task->lp_ctx; c->private = conn; @@ -523,6 +523,8 @@ ldap_service = talloc_zero(task, struct ldapsrv_service); if (ldap_service == NULL) goto failed; + ldap_service->task = task; + ldap_service->tls_params = tls_initialise(ldap_service, task->lp_ctx); if (ldap_service->tls_params == NULL) goto failed; Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.h =================================================================== --- branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2008-01-05 15:36:26 UTC (rev 26668) +++ branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2008-01-05 15:36:33 UTC (rev 26669) @@ -65,6 +65,7 @@ struct ldapsrv_service { struct tls_params *tls_params; + struct task_server *task; }; #include "ldap_server/proto.h" Modified: branches/SAMBA_4_0/source/lib/events/events.c =================================================================== --- branches/SAMBA_4_0/source/lib/events/events.c 2008-01-05 15:36:26 UTC (rev 26668) +++ branches/SAMBA_4_0/source/lib/events/events.c 2008-01-05 15:36:33 UTC (rev 26669) @@ -103,11 +103,8 @@ { #if _SAMBA_BUILD_ init_module_fn static_init[] = { STATIC_LIBEVENTS_MODULES }; - init_module_fn *shared_init; if (event_backends) return; - shared_init = load_samba_modules(NULL, global_loadparm, "events"); run_init_functions(static_init); - run_init_functions(shared_init); #else bool events_standard_init(void); bool events_select_init(void); Modified: branches/SAMBA_4_0/source/libcli/raw/clisocket.c =================================================================== --- branches/SAMBA_4_0/source/libcli/raw/clisocket.c 2008-01-05 15:36:26 UTC (rev 26668) +++ branches/SAMBA_4_0/source/libcli/raw/clisocket.c 2008-01-05 15:36:33 UTC (rev 26669) @@ -83,7 +83,7 @@ ctx = socket_connect_multi_send(state, host_addr, state->num_ports, state->ports, - lp_resolve_context(global_loadparm), + resolve_ctx, state->ctx->event_ctx); if (ctx == NULL) goto failed; ctx->async.fn = smbcli_sock_connect_recv_conn; Modified: branches/SAMBA_4_0/source/libcli/raw/rawacl.c =================================================================== --- branches/SAMBA_4_0/source/libcli/raw/rawacl.c 2008-01-05 15:36:26 UTC (rev 26668) +++ branches/SAMBA_4_0/source/libcli/raw/rawacl.c 2008-01-05 15:36:33 UTC (rev 26669) @@ -77,8 +77,7 @@ nt.out.data.length = IVAL(nt.out.params.data, 0); - ndr = ndr_pull_init_blob(&nt.out.data, mem_ctx, - lp_iconv_convenience(global_loadparm)); + ndr = ndr_pull_init_blob(&nt.out.data, mem_ctx, NULL); if (!ndr) { return NT_STATUS_INVALID_PARAMETER; } @@ -136,7 +135,7 @@ nt.in.params.data = params; nt.in.params.length = 8; - ndr = ndr_push_init_ctx(NULL, lp_iconv_convenience(global_loadparm)); + ndr = ndr_push_init_ctx(NULL, NULL); if (!ndr) return NULL; ndr_err = ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, io->set_secdesc.in.sd); Modified: branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c =================================================================== --- branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c 2008-01-05 15:36:26 UTC (rev 26668) +++ branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c 2008-01-05 15:36:33 UTC (rev 26669) @@ -175,11 +175,11 @@ } /* a way to force ascii SMB */ - if (!lp_unicode(global_loadparm)) { + if (!transport->options.unicode) { transport->negotiate.capabilities &= ~CAP_UNICODE; } - if (!lp_nt_status_support(global_loadparm)) { + if (!transport->options.ntstatus_support) { transport->negotiate.capabilities &= ~CAP_STATUS32; } Modified: branches/SAMBA_4_0/source/libnet/libnet_become_dc.c =================================================================== --- branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2008-01-05 15:36:26 UTC (rev 26668) +++ branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2008-01-05 15:36:33 UTC (rev 26669) @@ -2017,7 +2017,7 @@ v[0].sid = s->zero_sid; v[0].dn = s->forest.schema_dn_str; - ndr_err = ndr_push_struct_blob(&vd[0], vd, lp_iconv_convenience(global_loadparm), &v[0], + ndr_err = ndr_push_struct_blob(&vd[0], vd, NULL, &v[0], (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { c->status = ndr_map_error2ntstatus(ndr_err); @@ -2049,7 +2049,7 @@ v[0].sid = s->zero_sid; v[0].dn = s->domain.dn_str; - ndr_err = ndr_push_struct_blob(&vd[0], vd, lp_iconv_convenience(global_loadparm), &v[0], + ndr_err = ndr_push_struct_blob(&vd[0], vd, NULL, &v[0], (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { c->status = ndr_map_error2ntstatus(ndr_err); @@ -2131,7 +2131,7 @@ v[0].sid = s->zero_sid; v[0].dn = s->dest_dsa.computer_dn_str; - ndr_err = ndr_push_struct_blob(&vd[0], vd, lp_iconv_convenience(global_loadparm), &v[0], + ndr_err = ndr_push_struct_blob(&vd[0], vd, NULL, &v[0], (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { c->status = ndr_map_error2ntstatus(ndr_err); Modified: branches/SAMBA_4_0/source/libnet/libnet_vampire.c =================================================================== --- branches/SAMBA_4_0/source/libnet/libnet_vampire.c 2008-01-05 15:36:26 UTC (rev 26668) +++ branches/SAMBA_4_0/source/libnet/libnet_vampire.c 2008-01-05 15:36:33 UTC (rev 26669) @@ -72,7 +72,7 @@ user->user_private_info.SensitiveData = data.data; user->user_private_info.DataLength = data.length; - ndr_err = ndr_pull_struct_blob(&data, mem_ctx, lp_iconv_convenience(global_loadparm), &keys, (ndr_pull_flags_fn_t)ndr_pull_netr_USER_KEYS); + ndr_err = ndr_pull_struct_blob(&data, mem_ctx, NULL, &keys, (ndr_pull_flags_fn_t)ndr_pull_netr_USER_KEYS); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { *error_string = talloc_asprintf(mem_ctx, "Failed to parse Sensitive Data for %s:", username); dump_data(10, data.data, data.length); Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_in_connection.c =================================================================== --- branches/SAMBA_4_0/source/wrepl_server/wrepl_in_connection.c 2008-01-05 15:36:26 UTC (rev 26668) +++ branches/SAMBA_4_0/source/wrepl_server/wrepl_in_connection.c 2008-01-05 15:36:33 UTC (rev 26669) @@ -66,7 +66,7 @@ packet_in_blob.length = blob.length - 4; ndr_err = ndr_pull_struct_blob(&packet_in_blob, call, - lp_iconv_convenience(global_loadparm), + lp_iconv_convenience(wreplconn->service->task->lp_ctx), &call->req_packet, (ndr_pull_flags_fn_t)ndr_pull_wrepl_packet); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { @@ -91,7 +91,7 @@ /* and now encode the reply */ packet_out_wrap.packet = call->rep_packet; ndr_err = ndr_push_struct_blob(&packet_out_blob, call, - lp_iconv_convenience(global_loadparm), + lp_iconv_convenience(wreplconn->service->task->lp_ctx), &packet_out_wrap, (ndr_push_flags_fn_t)ndr_push_wrepl_wrap); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {