[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  1496a75 s3:smbd:vfs_acl: fix a PANIC when setting an ACL fails with ACCESS_DENIED
      from  59ae4dd VERSION: Bump version number up to rc7.

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


- Log -----------------------------------------------------------------
commit 1496a75c35f25fa3c4817793ac8737f4327c5dba
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 4 02:02:07 2012 +0100

    s3:smbd:vfs_acl: fix a PANIC when setting an ACL fails with ACCESS_DENIED
    
    Omission to free the talloc frame causes a panic (at least in developer mode)
    in the next main event loop due to "Frame not freed in order."
    (Freed frame ../source3/smbd/process.c:3617, expected ../source3/modules/vfs_acl_common.c:534.)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Dec  4 09:03:25 CET 2012 on sn-devel-104
    (cherry picked from commit 4a8028a96e20f140c2d423efd4c010a7d300ca72)
    
    Fix bug #9456 - developer-build: panic when acl_xattr fails with access denied.
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Tue Dec  4 13:34:24 CET 2012 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 59ced29..4e3aa72 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -590,6 +590,7 @@ static NTSTATUS fset_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp,
 		if (get_current_uid(handle->conn) == 0 ||
 				chown_needed == false ||
 				!(fsp->access_mask & SEC_STD_WRITE_OWNER)) {
+			TALLOC_FREE(frame);
 			return NT_STATUS_ACCESS_DENIED;
 		}
 


-- 
Samba Shared Repository