diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-01 18:52:55 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:34 -0500 |
commit | 2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad (patch) | |
tree | 2d02f6e998c150cca5323e574ffb8094fffc288f /source4/torture/winbind | |
parent | 4d7273715f109db82a4ee4852855927a32bb4073 (diff) | |
download | samba-2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad.tar.gz samba-2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad.tar.bz2 samba-2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad.zip |
r25446: Merge some changes I made on the way home from SFO:
2007-09-29 More higher-level passing around of lp_ctx.
2007-09-29 Fix warning.
2007-09-29 Pass loadparm contexts on a higher level.
2007-09-29 Avoid using global loadparm context.
(This used to be commit 3468952e771ab31f90b6c374ade01c5550810f42)
Diffstat (limited to 'source4/torture/winbind')
-rw-r--r-- | source4/torture/winbind/struct_based.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c index a375158060..d7e7c164b6 100644 --- a/source4/torture/winbind/struct_based.c +++ b/source4/torture/winbind/struct_based.c @@ -141,7 +141,8 @@ 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, WINBINDD_PRIV_SOCKET_SUBDIR); + default_dir = lock_path(torture, global_loadparm, + WINBINDD_PRIV_SOCKET_SUBDIR); expected_dir = torture_setting_string(torture, "winbindd private pipe dir", default_dir); |