[SCM] Samba Shared Repository - branch master updated

[Richard Sharpe]

The branch, master has been updated
       via  632af66 Check the return from create_acl_blob
      from  6bafb4a s3-smbd: Avoid creating a UID ACL entry for SIDs that are mapped as ID_TYPE_BOTH The GID ACL entry is what will be mapped in most cases, and so is sufficient.

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


- Log -----------------------------------------------------------------
commit 632af6645376185500820a5be9dbf5c0c3d1e515
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date:   Wed May 16 20:21:34 2012 -0700

    Check the return from create_acl_blob
    
    Autobuild-User: Richard Sharpe <sharpe at samba.org>
    Autobuild-Date: Thu May 17 07:17:29 CEST 2012 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 221b43f..c7bce57 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -592,10 +592,12 @@ static NTSTATUS fset_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp,
 		NDR_PRINT_DEBUG(security_descriptor,
 			discard_const_p(struct security_descriptor, psd));
 	}
-	/*
-	 * Perhaps create_acl_blob should have a status return as well
-	 */
-	create_acl_blob(psd, &blob, XATTR_SD_HASH_TYPE_SHA256, hash);
+	status = create_acl_blob(psd, &blob, XATTR_SD_HASH_TYPE_SHA256, hash);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(10, ("fset_nt_acl_xattr: create_acl_blob failed\n"));
+		return status;
+	}
+
 	status = store_acl_blob_fsp(handle, fsp, &blob);
 
 	return status;


-- 
Samba Shared Repository