summaryrefslogtreecommitdiff
path: root/lib/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-10 15:05:08 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-10 06:51:07 +0100
commit11f5d7c2f55f58ef7991d2ec2c4841e4492d4144 (patch)
treef8e4220b0f2827690b6de9f584bddeb5a96dc20e /lib/torture
parent8dc92c8f71311e95a3a3c297b32ed46477228f56 (diff)
downloadsamba-11f5d7c2f55f58ef7991d2ec2c4841e4492d4144.tar.gz
samba-11f5d7c2f55f58ef7991d2ec2c4841e4492d4144.tar.bz2
samba-11f5d7c2f55f58ef7991d2ec2c4841e4492d4144.zip
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 <abartlet@samba.org> Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'lib/torture')
-rw-r--r--lib/torture/torture.c4
1 files changed, 3 insertions, 1 deletions
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;