diff options
| author | Jeremy Allison <jra@samba.org> | 2011-08-29 16:53:04 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-10-24 19:15:40 +0200 |
| commit | b5c3fa15409016d081b9831ad597e26e55a549a3 (patch) | |
| tree | 0b987c3e9efc882f70308892a70fa5f31820c0d9 | |
| parent | d43d24dae9781d38bf6df8a96e63d967f1ca4ef7 (diff) | |
| download | samba-b5c3fa15409016d081b9831ad597e26e55a549a3.tar.gz samba-b5c3fa15409016d081b9831ad597e26e55a549a3.tar.xz samba-b5c3fa15409016d081b9831ad597e26e55a549a3.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.
(cherry picked from commit 4db250449dda30e3ffa05c8918e0cf39cbacc5d8)
| -rw-r--r-- | 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 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, |