CVE-2021-44141: s3: torture: In torture_mangle(), use torture_deltree() for setup...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14911

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c
index 5832a92cddac952f5897e43656812de3b64b937d..92754b9eeb62ae14f1cda597f569418d9a1f17b9 100644 (file)
--- a/source3/torture/mangle_test.c
+++ b/source3/torture/mangle_test.c
@@ -188,8 +188,7 @@ bool torture_mangle(int dummy)
                return False;
        }
 
-       cli_unlink(cli, "\\mangle_test\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-       cli_rmdir(cli, "\\mangle_test");
+       torture_deltree(cli, "\\mangle_test");
 
        if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\mangle_test"))) {
                printf("ERROR: Failed to make directory\n");
@@ -212,11 +211,7 @@ bool torture_mangle(int dummy)
                }
        }
 
-       cli_unlink(cli, "\\mangle_test\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-       if (!NT_STATUS_IS_OK(cli_rmdir(cli, "\\mangle_test"))) {
-               printf("ERROR: Failed to remove directory\n");
-               return False;
-       }
+       torture_deltree(cli, "\\mangle_test");
 
        printf("\nTotal collisions %u/%u  - %.2f%%   (%u failures)\n",
               collisions, total, (100.0*collisions) / total, failures);