From 11f5d7c2f55f58ef7991d2ec2c4841e4492d4144 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 10 Feb 2011 15:05:08 +1100 Subject: s4-torture: not having an output dir is not a fatal error just return NT_STATUS_OK, as nothing to cleanup Pair-Programmed-With: Andrew Bartlett Signed-off-by: Andrew Tridgell --- lib/torture/torture.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/torture') diff --git a/lib/torture/torture.c b/lib/torture/torture.c index 1f55cd04a8..a12ce657ba 100644 --- a/lib/torture/torture.c +++ b/lib/torture/torture.c @@ -143,7 +143,9 @@ static int local_deltree(const char *path) _PUBLIC_ NTSTATUS torture_deltree_outputdir(struct torture_context *tctx) { - SMB_ASSERT(tctx->outputdir != NULL); + if (tctx->outputdir == NULL) { + return NT_STATUS_OK; + } if ((strcmp(tctx->outputdir, "/") == 0) || (strcmp(tctx->outputdir, "") == 0)) { return NT_STATUS_INVALID_PARAMETER; -- cgit