[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-573-g7d5996e

[Tim Prouty]

The branch, v3-4-test has been updated
       via  7d5996e1d5eca454f651ca49a357d28077446309 (commit)
       via  0f01296bbb08d75ce693a65ea6cb0df80c1b4927 (commit)
      from  17616dddfaa26688387f671c870873056896f6b7 (commit)

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


- Log -----------------------------------------------------------------
commit 7d5996e1d5eca454f651ca49a357d28077446309
Author: David Kwan <david.kwan at isilon.com>
Date:   Fri Mar 20 16:03:08 2009 +0000

    s3 onefs: Change error status to NT_ACCESS_DENIED for errors in SET_SECURITY_DESC
    (cherry picked from commit ad98eae02e623a8ca8aa6a1c46d5aedea50e2e4b)

commit 0f01296bbb08d75ce693a65ea6cb0df80c1b4927
Author: Tim Prouty <tprouty at samba.org>
Date:   Tue Mar 24 17:05:16 2009 -0700

    s3: parse_packet can return NULL which is then dereferenced in match_mailslot_name
    (cherry picked from commit db5677d071fc58f38cab4ab800111455a8637edb)

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

Summary of changes:
 source3/libsmb/unexpected.c |    2 ++
 source3/modules/onefs_acl.c |   10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/unexpected.c b/source3/libsmb/unexpected.c
index df4d211..d123e24 100644
--- a/source3/libsmb/unexpected.c
+++ b/source3/libsmb/unexpected.c
@@ -162,6 +162,8 @@ static int traverse_match(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf,
 			state->match_type,
 			ip,
 			port);
+	if (!p)
+		return 0;
 
 	if ((state->match_type == NMB_PACKET &&
 	     p->packet.nmb.header.name_trn_id == state->match_id) ||
diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index 6f23d60..8ee31ab 100644
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -825,7 +825,7 @@ NTSTATUS onefs_samba_sd_to_sd(uint32 security_info_sent, SEC_DESC *psd,
 	/* Setup owner */
 	if (security_info_sent & OWNER_SECURITY_INFORMATION) {
 		if (!onefs_og_to_identity(psd->owner_sid, &owner, false, snum))
-			return NT_STATUS_UNSUCCESSFUL;
+			return NT_STATUS_ACCESS_DENIED;
 
 		SMB_ASSERT(owner.id.uid >= 0);
 
@@ -835,7 +835,7 @@ NTSTATUS onefs_samba_sd_to_sd(uint32 security_info_sent, SEC_DESC *psd,
 	/* Setup group */
 	if (security_info_sent & GROUP_SECURITY_INFORMATION) {
 		if (!onefs_og_to_identity(psd->group_sid, &group, true, snum))
-			return NT_STATUS_UNSUCCESSFUL;
+			return NT_STATUS_ACCESS_DENIED;
 
 		SMB_ASSERT(group.id.gid >= 0);
 
@@ -846,7 +846,7 @@ NTSTATUS onefs_samba_sd_to_sd(uint32 security_info_sent, SEC_DESC *psd,
 	if ((security_info_sent & DACL_SECURITY_INFORMATION) && (psd->dacl)) {
 		if (!onefs_samba_acl_to_acl(psd->dacl, &daclp, &ignore_aces,
 			snum))
-			return NT_STATUS_UNSUCCESSFUL;
+			return NT_STATUS_ACCESS_DENIED;
 
 		if (ignore_aces == true)
 			security_info_sent &= ~DACL_SECURITY_INFORMATION;
@@ -863,7 +863,7 @@ NTSTATUS onefs_samba_sd_to_sd(uint32 security_info_sent, SEC_DESC *psd,
 			if (psd->sacl) {
 				if (!onefs_samba_acl_to_acl(psd->sacl,
 					&saclp, &ignore_aces, snum))
-					return NT_STATUS_UNSUCCESSFUL;
+					return NT_STATUS_ACCESS_DENIED;
 
 				if (ignore_aces == true) {
 					security_info_sent &=
@@ -877,7 +877,7 @@ NTSTATUS onefs_samba_sd_to_sd(uint32 security_info_sent, SEC_DESC *psd,
 	DEBUG(5,("Setting up SD\n"));
 	if (aclu_initialize_sd(sd, psd->type, ownerp, groupp,
 		(daclp ? &daclp : NULL), (saclp ? &saclp : NULL), false))
-		return NT_STATUS_UNSUCCESSFUL;
+		return NT_STATUS_ACCESS_DENIED;
 
 	return NT_STATUS_OK;
 }


-- 
Samba Shared Repository