summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-08-29 16:46:15 -0700
committerJeremy Allison <jra@samba.org>2011-08-29 16:46:15 -0700
commit218cccfdf1820a9840a5cbc7df3915b6b58a762d (patch)
treee0fde941872859aa42c4c93a3d1421531827635b /source3
parentf7f6992a20dd29bd7643291e3b3d05bc8f6c9c76 (diff)
downloadsamba-218cccfdf1820a9840a5cbc7df3915b6b58a762d.tar.gz
samba-218cccfdf1820a9840a5cbc7df3915b6b58a762d.tar.bz2
samba-218cccfdf1820a9840a5cbc7df3915b6b58a762d.zip
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.
Diffstat (limited to 'source3')
-rw-r--r--source3/modules/vfs_acl_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index a4d712f525..f2f55ecf73 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -869,7 +869,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,