summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-08-29 16:53:04 -0700
committerKarolin Seeger <kseeger@samba.org>2011-08-30 20:55:23 +0200
commit4db250449dda30e3ffa05c8918e0cf39cbacc5d8 (patch)
tree2f881f435c87bba6e3b8c5187e147e681f71f6c7
parent0b1ce3f177b75e146fdae0b5531c54dedffada1d (diff)
downloadsamba-4db250449dda30e3ffa05c8918e0cf39cbacc5d8.tar.gz
samba-4db250449dda30e3ffa05c8918e0cf39cbacc5d8.tar.xz
samba-4db250449dda30e3ffa05c8918e0cf39cbacc5d8.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.
-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 b2098244422..af4c41d9403 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -862,7 +862,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(id); fsp; file_find_di_next(fsp)) {
+ for (fsp = file_find_di_first(id); fsp; fsp = file_find_di_next(fsp)) {
if (fsp->access_mask & DELETE_ACCESS &&
fsp->delete_on_close) {
/* We did open this for delete,