diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-05 19:03:43 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-05 13:06:03 -0600 |
| commit | df408d056ec03f2abe08ce0ea487e1875b90e7bf (patch) | |
| tree | 68cb7b83f12d50d8536acef9c1fed74d22ad9f54 /source4/smb_server | |
| parent | 01c79091924602bb5c3f1c0c823b2577c4708f6a (diff) | |
| download | samba-df408d056ec03f2abe08ce0ea487e1875b90e7bf.tar.gz samba-df408d056ec03f2abe08ce0ea487e1875b90e7bf.tar.bz2 samba-df408d056ec03f2abe08ce0ea487e1875b90e7bf.zip | |
r26672: Janitorial: Remove uses of global_loadparm.
(This used to be commit 18cd08623eaad7d2cd63b82ea5275d4dfd21cf00)
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/smb2/fileio.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb_server.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c index e853743b2f..0e83c78615 100644 --- a/source4/smb_server/smb2/fileio.c +++ b/source4/smb_server/smb2/fileio.c @@ -353,7 +353,7 @@ static void smb2srv_notify_send(struct ntvfs_request *ntvfs) ssize_t len; SIVAL(p, 4, io->smb2.out.changes[i].action); - len = push_string(lp_iconv_convenience(global_loadparm), p + 12, io->smb2.out.changes[i].name.s, + len = push_string(lp_iconv_convenience(ntvfs->ctx->lp_ctx), p + 12, io->smb2.out.changes[i].name.s, blob.length - (p+12 - blob.data), STR_UNICODE); SIVAL(p, 8, len); diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 082de6540b..cbff585e21 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -185,7 +185,8 @@ _PUBLIC_ NTSTATUS smbsrv_add_socket(struct event_context *event_context, for (i=0;ports[i];i++) { uint16_t port = atoi(ports[i]); if (port == 0) continue; - status = stream_setup_socket(event_context, model_ops, &smb_stream_ops, + status = stream_setup_socket(event_context, lp_ctx, + model_ops, &smb_stream_ops, "ipv4", address, &port, lp_socket_options(lp_ctx), NULL); @@ -257,7 +258,8 @@ static NTSTATUS smbsrv_init(struct event_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops) { - return task_server_startup(event_context, model_ops, smbsrv_task_init); + return task_server_startup(event_context, lp_ctx, + model_ops, smbsrv_task_init); } /* called at smbd startup - register ourselves as a server service */ |