summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-13 23:23:25 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:50:09 +0100
commit84b476394713d4f2b84782c59dcc084a25af360f (patch)
tree592fe90a816f31414528148254d616ad8fe6b63a /source4/smbd
parente31abef15f7696cf39e9e81307f153da93568e02 (diff)
downloadsamba-84b476394713d4f2b84782c59dcc084a25af360f.tar.gz
samba-84b476394713d4f2b84782c59dcc084a25af360f.tar.bz2
samba-84b476394713d4f2b84782c59dcc084a25af360f.zip
r26441: Remove global_loadparm uses.
(This used to be commit 32007c6277efa46341da7741b749a98633d71640)
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/service_stream.c4
-rw-r--r--source4/smbd/service_task.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 8df8c474f5..6d2e95dc94 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -183,7 +183,9 @@ static void stream_new_connection(struct event_context *ev,
/* setup to receive internal messages on this connection */
srv_conn->msg_ctx = messaging_init(srv_conn,
lp_messaging_path(srv_conn, global_loadparm),
- srv_conn->server_id, ev);
+ srv_conn->server_id,
+ lp_iconv_convenience(global_loadparm),
+ ev);
if (!srv_conn->msg_ctx) {
stream_terminate_connection(srv_conn, "messaging_init() failed");
return;
diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c
index dceda5a922..f286da5cf6 100644
--- a/source4/smbd/service_task.c
+++ b/source4/smbd/service_task.c
@@ -68,7 +68,9 @@ static void task_server_callback(struct event_context *event_ctx,
task->msg_ctx = messaging_init(task,
lp_messaging_path(task, task->lp_ctx),
- task->server_id, task->event_ctx);
+ task->server_id,
+ lp_iconv_convenience(task->lp_ctx),
+ task->event_ctx);
if (!task->msg_ctx) {
task_server_terminate(task, "messaging_init() failed");
return;