svn commit: samba r26670 - in branches/SAMBA_4_0: .
source/libcli/smb_composite source/nbt_server/wins
source/ntptr/simple_ldb source/ntvfs/common
jelmer at samba.org
jelmer at samba.org
Sat Jan 5 15:36:38 GMT 2008
Author: jelmer
Date: 2008-01-05 15:36:37 +0000 (Sat, 05 Jan 2008)
New Revision: 26670
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26670
Log:
Janitorial: Remove global_loadparm uses.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/libcli/smb_composite/fsinfo.c
branches/SAMBA_4_0/source/nbt_server/wins/winswack.c
branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c
branches/SAMBA_4_0/source/ntvfs/common/opendb_tdb.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/libcli/smb_composite/fsinfo.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb_composite/fsinfo.c 2008-01-05 15:36:33 UTC (rev 26669)
+++ branches/SAMBA_4_0/source/libcli/smb_composite/fsinfo.c 2008-01-05 15:36:37 UTC (rev 26670)
@@ -153,11 +153,11 @@
state->connect->in.fallback_to_anonymous = false;
state->connect->in.workgroup = io->in.workgroup;
- lp_smbcli_options(global_loadparm, &state->connect->in.options);
+ state->connect->in.options = tree->session->transport->options;
c->state = COMPOSITE_STATE_IN_PROGRESS;
state->stage = FSINFO_CONNECT;
- c->event_ctx = talloc_reference(c, tree->session->transport->socket->event.ctx);
+ c->event_ctx = talloc_reference(c, tree->session->transport->socket->event.ctx);
c->private_data = state;
state->creq = smb_composite_connect_send(state->connect, state,
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winswack.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/winswack.c 2008-01-05 15:36:33 UTC (rev 26669)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winswack.c 2008-01-05 15:36:37 UTC (rev 26670)
@@ -306,7 +306,7 @@
s->req = req;
s->io.in.nbtd_server = nbtd_server;
- s->io.in.nbt_port = lp_nbt_port(global_loadparm);
+ s->io.in.nbt_port = lp_nbt_port(nbtd_server->task->lp_ctx);
s->io.in.event_ctx = msg->ev;
s->io.in.name = &req->in.name;
s->io.in.num_addresses = req->in.num_addrs;
Modified: branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c 2008-01-05 15:36:33 UTC (rev 26669)
+++ branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c 2008-01-05 15:36:37 UTC (rev 26670)
@@ -175,7 +175,7 @@
os.build = dcesrv_common_get_version_build(mem_ctx, server->ntptr->lp_ctx);
os.extra_string = "";
- ndr_err = ndr_push_struct_blob(&blob, mem_ctx, lp_iconv_convenience(global_loadparm), &os, (ndr_push_flags_fn_t)ndr_push_spoolss_OSVersion);
+ ndr_err = ndr_push_struct_blob(&blob, mem_ctx, lp_iconv_convenience(server->ntptr->lp_ctx), &os, (ndr_push_flags_fn_t)ndr_push_spoolss_OSVersion);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return WERR_GENERAL_FAILURE;
}
@@ -195,7 +195,7 @@
os_ex.unknown2 = 0;
os_ex.unknown3 = 0;
- ndr_err = ndr_push_struct_blob(&blob, mem_ctx, lp_iconv_convenience(global_loadparm), &os_ex, (ndr_push_flags_fn_t)ndr_push_spoolss_OSVersionEx);
+ ndr_err = ndr_push_struct_blob(&blob, mem_ctx, lp_iconv_convenience(server->ntptr->lp_ctx), &os_ex, (ndr_push_flags_fn_t)ndr_push_spoolss_OSVersionEx);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return WERR_GENERAL_FAILURE;
}
Modified: branches/SAMBA_4_0/source/ntvfs/common/opendb_tdb.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/common/opendb_tdb.c 2008-01-05 15:36:33 UTC (rev 26669)
+++ branches/SAMBA_4_0/source/ntvfs/common/opendb_tdb.c 2008-01-05 15:36:37 UTC (rev 26670)
@@ -205,7 +205,7 @@
blob.data = dbuf.dptr;
blob.length = dbuf.dsize;
- ndr_err = ndr_pull_struct_blob(&blob, lck, lp_iconv_convenience(global_loadparm), file, (ndr_pull_flags_fn_t)ndr_pull_opendb_file);
+ ndr_err = ndr_pull_struct_blob(&blob, lck, lp_iconv_convenience(lck->odb->ntvfs_ctx->lp_ctx), file, (ndr_pull_flags_fn_t)ndr_pull_opendb_file);
free(dbuf.dptr);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return ndr_map_error2ntstatus(ndr_err);
@@ -233,7 +233,7 @@
return NT_STATUS_OK;
}
- ndr_err = ndr_push_struct_blob(&blob, lck, lp_iconv_convenience(global_loadparm), file, (ndr_push_flags_fn_t)ndr_push_opendb_file);
+ ndr_err = ndr_push_struct_blob(&blob, lck, lp_iconv_convenience(lck->odb->ntvfs_ctx->lp_ctx), file, (ndr_push_flags_fn_t)ndr_push_opendb_file);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return ndr_map_error2ntstatus(ndr_err);
}
More information about the samba-cvs
mailing list