summaryrefslogtreecommitdiff
path: root/source4/torture/ui.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-03 02:58:12 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:21 +0100
commit779f452a722500491e05ba82f72897bf53c90b04 (patch)
tree37084ae1ded1d86111876ac3237520e97c58ec15 /source4/torture/ui.c
parent51d8da8ae3fda8e66532962f94f91553a4cef143 (diff)
downloadsamba-779f452a722500491e05ba82f72897bf53c90b04.tar.gz
samba-779f452a722500491e05ba82f72897bf53c90b04.tar.bz2
samba-779f452a722500491e05ba82f72897bf53c90b04.zip
r26240: We now actually use torture_context pointers for more than just allocation.
Fix a few places where we were passing talloc contexts that were not torture contexts. (This used to be commit 9d12fc7dc5abc82c8ad189420db1f85a89c71e4f)
Diffstat (limited to 'source4/torture/ui.c')
-rw-r--r--source4/torture/ui.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/torture/ui.c b/source4/torture/ui.c
index 67442f1df1..95d95937ed 100644
--- a/source4/torture/ui.c
+++ b/source4/torture/ui.c
@@ -387,7 +387,12 @@ const char *torture_setting_string(struct torture_context *test,
const char *name,
const char *default_value)
{
- const char *ret = lp_parm_string(test->lp_ctx, NULL, "torture", name);
+ const char *ret;
+
+ SMB_ASSERT(test != NULL);
+ SMB_ASSERT(test->lp_ctx != NULL);
+
+ ret = lp_parm_string(test->lp_ctx, NULL, "torture", name);
if (ret == NULL)
return default_value;