diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 22:32:11 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:15 +0100 |
| commit | 6c999cd12344f2bb8b1d2941210b4c205b3e0aad (patch) | |
| tree | 0911e4ca75694e080173c2863e2c41ff5881309c /source4/torture | |
| parent | 934e932387ea5668ec000bcefe4ec86935297339 (diff) | |
| download | samba-6c999cd12344f2bb8b1d2941210b4c205b3e0aad.tar.gz samba-6c999cd12344f2bb8b1d2941210b4c205b3e0aad.tar.bz2 samba-6c999cd12344f2bb8b1d2941210b4c205b3e0aad.zip | |
r26236: Remove more uses of global_loadparm or specify loadparm_context explicitly.
(This used to be commit 5b29ef7c03d9ae76b0ca909e9f03a58e1bad3521)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/basic/base.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/wkssvc.c | 20 |
2 files changed, 6 insertions, 16 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 1415b4195f..5c5428d61f 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -355,7 +355,7 @@ static bool run_negprot_nowait(struct torture_context *tctx) for (i=0;i<100;i++) { struct smbcli_request *req; - req = smb_raw_negotiate_send(cli->transport, PROTOCOL_NT1); + req = smb_raw_negotiate_send(cli->transport, lp_unicode(global_loadparm), PROTOCOL_NT1); event_loop_once(cli->transport->socket->event.ctx); if (req->state == SMBCLI_REQUEST_ERROR) { if (i > 0) { diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c index ff5c20e258..9a2f518535 100644 --- a/source4/torture/rpc/wkssvc.c +++ b/source4/torture/rpc/wkssvc.c @@ -1228,17 +1228,11 @@ static bool test_NetrJoinDomain2(struct torture_context *tctx, break; } - domain_admin_account = lp_parm_string(global_loadparm, NULL, - "torture", - "domain_admin_account"); + domain_admin_account = torture_setting_string(tctx, "domain_admin_account", NULL); - domain_admin_password = lp_parm_string(global_loadparm, NULL, - "torture", - "domain_admin_password"); + domain_admin_password = torture_setting_string(tctx, "domain_admin_password", NULL); - domain_name = lp_parm_string(global_loadparm, NULL, - "torture", - "domain_name"); + domain_name = torture_setting_string(tctx, "domain_name", NULL); if ((domain_admin_account == NULL) || (domain_admin_password == NULL) || @@ -1318,13 +1312,9 @@ static bool test_NetrUnjoinDomain2(struct torture_context *tctx, break; } - domain_admin_account = lp_parm_string(global_loadparm, NULL, - "torture", - "domain_admin_account"); + domain_admin_account = torture_setting_string(tctx, "domain_admin_account", NULL); - domain_admin_password = lp_parm_string(global_loadparm, NULL, - "torture", - "domain_admin_password"); + domain_admin_password = torture_setting_string(tctx, "domain_admin_password", NULL); if ((domain_admin_account == NULL) || (domain_admin_password == NULL)) { |