[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  088436d s3:winbindd:autorid check that transaction start did work
       via  09494ed s3:smbd fix some compiler warnings
       via  e8c2f81 s3:vfs/gpfs: Have inherited deny ACE's show up in ACLs
      from  d36aecc s4:libcli:raw: fix a comment typo in smb_setfileinfo()

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


- Log -----------------------------------------------------------------
commit 088436dff3fb12ec0b82f15fa971a48d798bd9b6
Author: Christian Ambach <ambi at samba.org>
Date:   Tue May 8 17:16:49 2012 +0200

    s3:winbindd:autorid check that transaction start did work
    
    this fixes Coverity #700172 CHECKED_RETURN
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Wed May  9 00:27:08 CEST 2012 on sn-devel-104

commit 09494ed6133fd4d71161969249adf187732e2709
Author: Christian Ambach <ambi at samba.org>
Date:   Tue May 8 16:03:13 2012 +0200

    s3:smbd fix some compiler warnings

commit e8c2f81ef3e44fdd31047582f933276a48192e89
Author: Alexander Werth <alexander.werth at de.ibm.com>
Date:   Fri Jan 20 19:17:21 2012 +0100

    s3:vfs/gpfs: Have inherited deny ACE's show up in ACLs
    
    Don't use the mode for the get_acl call that surpresses
    inherited deny ACE's. This is now possible since
    the inherited ACE flag exists now in GPFS and Samba.

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

Summary of changes:
 source3/modules/vfs_gpfs.c       |    4 ++--
 source3/smbd/notify_internal.c   |    4 ++--
 source3/winbindd/idmap_autorid.c |    6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 80f6d6e..4b0f9eb 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -232,7 +232,7 @@ static struct gpfs_acl *gpfs_getacl_alloc(const char *fname, gpfs_aclType_t type
 	acl->acl_version = 0;
 	acl->acl_type = type;
 
-	ret = smbd_gpfs_getacl((char *)fname, GPFS_GETACL_STRUCT | GPFS_ACL_SAMBA, acl);
+	ret = smbd_gpfs_getacl((char *)fname, GPFS_GETACL_STRUCT, acl);
 	if ((ret != 0) && (errno == ENOSPC)) {
 		struct gpfs_acl *new_acl = (struct gpfs_acl *)TALLOC_SIZE(
 			mem_ctx, acl->acl_len + sizeof(struct gpfs_acl));
@@ -247,7 +247,7 @@ static struct gpfs_acl *gpfs_getacl_alloc(const char *fname, gpfs_aclType_t type
 		new_acl->acl_type = acl->acl_type;
 		acl = new_acl;
 
-		ret = smbd_gpfs_getacl((char *)fname, GPFS_GETACL_STRUCT | GPFS_ACL_SAMBA, acl);
+		ret = smbd_gpfs_getacl((char *)fname, GPFS_GETACL_STRUCT, acl);
 	}
 	if (ret != 0)
 	{
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index aa02e32..9af3b45 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -513,8 +513,8 @@ static void notify_trigger_index_parser(TDB_DATA key, TDB_DATA data,
 
 static int vnn_cmp(const void *p1, const void *p2)
 {
-	uint32_t *vnn1 = (uint32_t *)p1;
-	uint32_t *vnn2 = (uint32_t *)p2;
+	const uint32_t *vnn1 = (const uint32_t *)p1;
+	const uint32_t *vnn2 = (const uint32_t *)p2;
 
 	if (*vnn1 < *vnn2) {
 		return -1;
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 08dcc65..df63fa9 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -435,7 +435,11 @@ static NTSTATUS idmap_autorid_map_sid_to_id(struct idmap_domain *dom,
 		   sid_string_dbg(map->sid)));
 
 	/* create new mapping */
-	dbwrap_transaction_start(ctx->db);
+	res = dbwrap_transaction_start(ctx->db);
+	if (res != 0) {
+		DEBUG(2, ("transaction_start failed\n"));
+		return NT_STATUS_INTERNAL_DB_CORRUPTION;
+	}
 
 	ret = idmap_tdb_common_new_mapping(dom, map);
 


-- 
Samba Shared Repository