3 files changed, 1 insertions, 9 deletions
diff --git a/source4/torture/subunit.c b/source4/torture/subunit.c
index 2a1e6e1cb6..3c4790b706 100644
--- a/source4/torture/subunit.c
+++ b/source4/torture/subunit.c
@@ -146,6 +146,7 @@ static void run_subunit_message(struct torture_context *context,
 
 	switch (field) {
 	case SUBUNIT_TEST:
+		test.description = comment;
 		torture_ui_test_start(context, NULL, &test);
 		break;
 	case SUBUNIT_FAILURE:
diff --git a/source4/torture/ui.c b/source4/torture/ui.c
index beb0e8fa9c..3769643a0c 100644
--- a/source4/torture/ui.c
+++ b/source4/torture/ui.c
@@ -374,12 +374,6 @@ struct torture_tcase *torture_suite_add_simple_test(
 	return tcase;
 }
 
-BOOL torture_teardown_free(struct torture_context *torture, void *data)
-{
-	return talloc_free(data);
-}
-
-
 bool torture_suite_add_suite(struct torture_suite *suite, 
 							 struct torture_suite *child)
 {
diff --git a/source4/torture/ui.h b/source4/torture/ui.h
index b145989046..64127fa8d0 100644
--- a/source4/torture/ui.h
+++ b/source4/torture/ui.h
@@ -291,9 +291,6 @@ bool torture_setting_bool(struct torture_context *test,
 						  const char *name, 
 						  bool default_value);
 
-/* Helper function commonly used */
-bool torture_teardown_free(struct torture_context *torture, void *data);
-
 struct torture_suite *torture_find_suite(struct torture_suite *parent, 
 										 const char *name);