[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  bc6bcee s3:vfs_gpfs: add no memory check in gpfs2smb_acl()
       via  0f630ab s3:vfs_gpfs: make sure we return the correct errno in gpfs2smb_acl()
       via  b3eb78c s4:smbd/open: add missing TALLOC_FREE(frame) to inherit_new_acl()
       via  d598704 s3:vfs_aixacl2: make use of vfs_aixacl_util.h
      from  00e2d83 s3: Open gencache_notrans with TDB_NOSYNC

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bc6bceec655f241f23d713edc0d7a2633b5d6592
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Nov 28 11:44:58 2012 +0100

    s3:vfs_gpfs: add no memory check in gpfs2smb_acl()
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Wed Nov 28 14:06:27 CET 2012 on sn-devel-104

commit 0f630abb3f197a8b672c6aa96362d83fdad1f92f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Nov 28 11:44:15 2012 +0100

    s3:vfs_gpfs: make sure we return the correct errno in gpfs2smb_acl()
    
    TALLOC_FREE() could overwrite errno.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit b3eb78c4f7123ccad6af50379c29d0939590d1ff
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Nov 28 11:38:13 2012 +0100

    s4:smbd/open: add missing TALLOC_FREE(frame) to inherit_new_acl()
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit d5987048347beefa720f902d97b621e6cb719fdf
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Nov 28 11:21:51 2012 +0100

    s3:vfs_aixacl2: make use of vfs_aixacl_util.h
    
    This should fix the build.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 source3/modules/vfs_aixacl2.c |    4 +---
 source3/modules/vfs_gpfs.c    |    7 ++++++-
 source3/smbd/open.c           |    2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index 327b06d..65625d1 100644
--- a/source3/modules/vfs_aixacl2.c
+++ b/source3/modules/vfs_aixacl2.c
@@ -21,15 +21,13 @@
 #include "system/filesys.h"
 #include "smbd/smbd.h"
 #include "nfs4_acls.h"
+#include "vfs_aixacl_util.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
 #define AIXACL2_MODULE_NAME "aixacl2"
 
-extern SMB_ACL_T aixacl_to_smbacl( struct acl *file_acl);
-extern struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
-
 typedef union aixjfs2_acl_t {
 	nfs4_acl_int_t jfs2_acl[1];
 	aixc_acl_t aixc_acl[1];
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 8f5a19c..e2058e1 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -575,6 +575,11 @@ static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl, TALLOC_CTX *mem_ctx)
 	result->count = pacl->acl_nace;
 	result->acl = talloc_realloc(result, result->acl, struct smb_acl_entry,
 				     result->count);
+	if (result->acl == NULL) {
+		TALLOC_FREE(result);
+		errno = ENOMEM;
+		return NULL;
+	}
 
 	for (i=0; i<pacl->acl_nace; i++) {
 		struct smb_acl_entry *ace = &result->acl[i];
@@ -608,8 +613,8 @@ static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl, TALLOC_CTX *mem_ctx)
 		default:
 			DEBUG(10, ("Got invalid ace_type: %d\n",
 				   g_ace->ace_type));
-			errno = EINVAL;
 			TALLOC_FREE(result);
+			errno = EINVAL;
 			return NULL;
 		}
 
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 201f698..d736f4f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3460,6 +3460,7 @@ static NTSTATUS inherit_new_acl(files_struct *fsp)
 	size_t size = 0;
 
 	if (!parent_dirname(frame, fsp->fsp_name->base_name, &parent_name, NULL)) {
+		TALLOC_FREE(frame);
 		return NT_STATUS_NO_MEMORY;
 	}
 
@@ -3469,6 +3470,7 @@ static NTSTATUS inherit_new_acl(files_struct *fsp)
 				    frame,
 				    &parent_desc);
 	if (!NT_STATUS_IS_OK(status)) {
+		TALLOC_FREE(frame);
 		return status;
 	}
 


-- 
Samba Shared Repository