s3: smbd: Fix recursive directory delete of a directory containing veto file and...

Remove knownfail.

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 73de1194c3c429ab93d722a852aa4f54213b112a)

diff --git a/selftest/knownfail.d/veto_rmdir b/selftest/knownfail.d/veto_rmdir
deleted file mode 100644 (file)
index ecced55..0000000
--- a/selftest/knownfail.d/veto_rmdir
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.blackbox.test_veto_rmdir.rmdir can delete directory containing a veto file\(fileserver\)

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 191626557dc22db8c4a19b984bc3a9006b90e547..470ca7f1b6d389e8e76774cc14c8b030b985e74a 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1267,7 +1267,7 @@ static NTSTATUS rmdir_internals(TALLOC_CTX *ctx, struct files_struct *fsp)
 
        /* Retry the rmdir */
        ret = SMB_VFS_UNLINKAT(conn,
-                              dirfsp,
+                              parent_fname->fsp,
                               at_fname,
                               AT_REMOVEDIR);