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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  c4e0462 Fix bug #8644 - vfs_acl_xattr and vfs_acl_tdb modules can fail to add inheritable entries on a directory with no stored ACL.
      from  1854e6a s3-winbind: Add an update function for winbind cache.

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


- Log -----------------------------------------------------------------
commit c4e0462a9edfee64cba6cf5db18a54cc3c51c4f1
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 2 10:55:40 2011 -0800

    Fix bug #8644 - vfs_acl_xattr and vfs_acl_tdb modules can fail to add inheritable entries on a directory with no stored ACL.
    
    If referring to an fsp sbuf can be left as an uninitialized variable,
    causing the 'is_directory' variable to be false when it should be true.
    (cherry picked from commit 16c0d52842386fc2ebf975166b57b888d36796c5)

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

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 ecc889a..e8c79e6 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -373,7 +373,7 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct *handle,
 				return map_nt_error_from_unix(errno);
 			}
 		}
-		is_directory = S_ISDIR(sbuf.st_ex_mode);
+		is_directory = S_ISDIR(psbuf->st_ex_mode);
 
 		if (ignore_file_system_acl) {
 			TALLOC_FREE(pdesc_next);


-- 
Samba Shared Repository