From 955b93d7e978d07d62f4b95ef2e5eb23520781c6 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 29 Aug 2011 16:46:15 -0700 Subject: [PATCH] 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) --- source3/modules/vfs_acl_common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index b6fcbb0..bc06f0b 100644 --- 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, -- 1.7.3.1