Fix bug Bug 8422 - Infinite loop in ACL module code.

Missing assignment means this loop will never terminate. Need to be applied
to 3.5.x and 3.6.1.
(cherry picked from commit 218cccfdf1820a9840a5cbc7df3915b6b58a762d)
(cherry picked from commit 225c66ada497449a55d2eed6dfb27cedf3a863c0)

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index b6fcbb09dde7af990f579fe984c93e799fe3194b..bc06f0b3d226007cd90776ad6136d3d1f66d2637 100644 (file)
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -868,7 +868,7 @@ static int acl_common_remove_object(vfs_handle_struct *handle,
        /* Ensure we have this file open with DELETE access. */
        id = vfs_file_id_from_sbuf(conn, &local_fname.st);
        for (fsp = file_find_di_first(conn->sconn, id); fsp;
-            file_find_di_next(fsp)) {
+                    fsp = file_find_di_next(fsp)) {
                if (fsp->access_mask & DELETE_ACCESS &&
                                fsp->delete_on_close) {
                        /* We did open this for delete,