[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  225c66a Fix bug Bug 8422 - Infinite loop in ACL module code.
      from  9bf2b30 Fix bug #8395 - optimize serverid_exists() for Solaris.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 225c66ada497449a55d2eed6dfb27cedf3a863c0
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Aug 29 16:46:15 2011 -0700

    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)

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_acl_common.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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,


-- 
Samba Shared Repository