diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 00:28:22 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:20 +0100 |
| commit | bbdfbf8d9d486aee51117976b8f825759a4c4a37 (patch) | |
| tree | c0f97e145aae09c3e7e5387471fb3fb0ab839596 /source4/torture/winbind | |
| parent | 291ddf433685ee5c25e172885045a4b60d7bb1ee (diff) | |
| download | samba-bbdfbf8d9d486aee51117976b8f825759a4c4a37.tar.gz samba-bbdfbf8d9d486aee51117976b8f825759a4c4a37.tar.bz2 samba-bbdfbf8d9d486aee51117976b8f825759a4c4a37.zip | |
r26238: Add a loadparm context parameter to torture_context, remove more uses of global_loadparm.
(This used to be commit a33a5530545086b81a3b205aa109dff11c546926)
Diffstat (limited to 'source4/torture/winbind')
| -rw-r--r-- | source4/torture/winbind/struct_based.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c index 3a3629fe5d..0fe2148b75 100644 --- a/source4/torture/winbind/struct_based.c +++ b/source4/torture/winbind/struct_based.c @@ -125,7 +125,7 @@ static bool torture_winbind_struct_info(struct torture_context *torture) separator = torture_setting_string(torture, "winbindd separator", - lp_winbind_separator(global_loadparm)); + lp_winbind_separator(torture->lp_ctx)); torture_assert_int_equal(torture, rep.data.info.winbind_separator, *separator, @@ -154,7 +154,7 @@ static bool torture_winbind_struct_priv_pipe_dir(struct torture_context *torture torture_assert(torture, got_dir, "NULL WINBINDD_PRIV_PIPE_DIR\n"); - default_dir = lock_path(torture, global_loadparm, + default_dir = lock_path(torture, torture->lp_ctx, WINBINDD_PRIV_SOCKET_SUBDIR); expected_dir = torture_setting_string(torture, "winbindd private pipe dir", @@ -180,7 +180,7 @@ static bool torture_winbind_struct_netbios_name(struct torture_context *torture) expected = torture_setting_string(torture, "winbindd netbios name", - lp_netbios_name(global_loadparm)); + lp_netbios_name(torture->lp_ctx)); torture_assert_str_equal(torture, rep.data.netbios_name, expected, @@ -212,7 +212,7 @@ static bool torture_winbind_struct_domain_name(struct torture_context *torture) expected = torture_setting_string(torture, "winbindd netbios domain", - lp_workgroup(global_loadparm)); + lp_workgroup(torture->lp_ctx)); get_winbind_domain(torture, &domain); |