diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 23:23:25 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:09 +0100 |
| commit | 84b476394713d4f2b84782c59dcc084a25af360f (patch) | |
| tree | 592fe90a816f31414528148254d616ad8fe6b63a /source4/scripting/ejs | |
| parent | e31abef15f7696cf39e9e81307f153da93568e02 (diff) | |
| download | samba-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/scripting/ejs')
| -rw-r--r-- | source4/scripting/ejs/smbcalls_auth.c | 3 | ||||
| -rw-r--r-- | source4/scripting/ejs/smbcalls_rpc.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c index 7747bb14c6..89370890c8 100644 --- a/source4/scripting/ejs/smbcalls_auth.c +++ b/source4/scripting/ejs/smbcalls_auth.c @@ -56,7 +56,8 @@ static int ejs_doauth(MprVarHandle eid, } else { /* Hope we can find the event context somewhere up there... */ ev = event_context_find(tmp_ctx); - msg = messaging_client_init(tmp_ctx, lp_messaging_path(tmp_ctx, global_loadparm), ev); + msg = messaging_client_init(tmp_ctx, lp_messaging_path(tmp_ctx, global_loadparm), + lp_iconv_convenience(global_loadparm), ev); } if (auth_types) { diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c index 535c1d2e34..2bfc8b5883 100644 --- a/source4/scripting/ejs/smbcalls_rpc.c +++ b/source4/scripting/ejs/smbcalls_rpc.c @@ -80,7 +80,9 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv) for (i=0;i<10000;i++) { p->msg_ctx = messaging_init(p, lp_messaging_path(p, global_loadparm), - cluster_id(EJS_ID_BASE + i), ev); + cluster_id(EJS_ID_BASE + i), + lp_iconv_convenience(global_loadparm), + ev); if (p->msg_ctx) break; } if (p->msg_ctx == NULL) { |