diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 08:48:57 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 08:48:57 +1100 |
| commit | 3eef0664c59c7afef117132c1d2ebccf22ad748e (patch) | |
| tree | 17f4ae2a47cc7d3bac266f5ca2033140e6a4e81e /source4/scripting/ejs/smbcalls_cli.c | |
| parent | 3abf47fe87e72b18c94157c3f993b7f2fca8c248 (diff) | |
| parent | 2ba62662f8e2578153be3125eb557b9349ccfd3b (diff) | |
| download | samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.tar.gz samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.tar.bz2 samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 04db9b184491415b3479fd79e1c07ba738818eb9)
Diffstat (limited to 'source4/scripting/ejs/smbcalls_cli.c')
| -rw-r--r-- | source4/scripting/ejs/smbcalls_cli.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c index 8295a0879f..dbb36312da 100644 --- a/source4/scripting/ejs/smbcalls_cli.c +++ b/source4/scripting/ejs/smbcalls_cli.c @@ -432,23 +432,23 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv) /* Set up credentials */ creds = cli_credentials_init(NULL); - cli_credentials_set_conf(creds, global_loadparm); + cli_credentials_set_conf(creds, mprLpCtx()); cli_credentials_parse_string(creds, argv[1], CRED_SPECIFIED); /* Do connect */ io.in.dest_host = hostname; - io.in.dest_ports = lp_smb_ports(global_loadparm); + io.in.dest_ports = lp_smb_ports(mprLpCtx()); io.in.called_name = strupper_talloc(mem_ctx, hostname); io.in.service = sharename; io.in.service_type = "?????"; io.in.credentials = creds; io.in.fallback_to_anonymous = false; - io.in.workgroup = lp_workgroup(global_loadparm); - lp_smbcli_options(global_loadparm, &io.in.options); + io.in.workgroup = lp_workgroup(mprLpCtx()); + lp_smbcli_options(mprLpCtx(), &io.in.options); result = smb_composite_connect(&io, mem_ctx, - lp_resolve_context(global_loadparm), + lp_resolve_context(mprLpCtx()), NULL); tree = io.out.tree; |