[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  9b2aa35 s3: Remove old mode special substitution.
       via  4a9e5d2 s3:idmap_autorid: Add a NULL check in idmap_autorid_preallocate_wellknown
       via  ca90681 s3:idmap_autorid: Don't zero in idmap_autorid_preallocate_wellknown
       via  a061b6f s3:idmap_autorid: Use ARRAY_SIZE where appropriate
      from  0529b59 s3-winbind: Do not delete an existing valid credential cache.

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


- Log -----------------------------------------------------------------
commit 9b2aa351ceb756d6ea63f3158f0e983ae7262da8
Author: Alexander Werth <alexander.werth at de.ibm.com>
Date:   Tue Jul 9 17:14:08 2013 +0200

    s3: Remove old mode special substitution.
    
    The mode special substitution now happens in a separate function.
    The substitution at this point is unnecessary.
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Christian Ambach <ambi at samba.org>
    
    Autobuild-User(master): Christian Ambach <ambi at samba.org>
    Autobuild-Date(master): Tue Jul 16 00:52:26 CEST 2013 on sn-devel-104

commit 4a9e5d24749f7d8571f107c20ee66092ce7ab21d
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 11 13:10:25 2013 +0200

    s3:idmap_autorid: Add a NULL check in idmap_autorid_preallocate_wellknown
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Christian Ambach <ambi at samba.org>

commit ca9068189e00ce1714790933250080ab1c310ee5
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 11 13:08:39 2013 +0200

    s3:idmap_autorid: Don't zero in idmap_autorid_preallocate_wellknown
    
    We initialize everything later anyway
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Christian Ambach <ambi at samba.org>

commit a061b6fe43f3e00dadb5c23244c68e5bc241dfce
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 11 13:07:52 2013 +0200

    s3:idmap_autorid: Use ARRAY_SIZE where appropriate
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Christian Ambach <ambi at samba.org>

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

Summary of changes:
 source3/modules/nfs4_acls.c      |   15 ++-------------
 source3/winbindd/idmap_autorid.c |    8 ++++++--
 2 files changed, 8 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 255741c..dab1a2a 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -739,20 +739,9 @@ static bool smbacl4_fill_ace4(
 
 		if (sid_to_gid(&ace_nt->trustee, &gid)) {
 			ace_v4->aceFlags |= SMB_ACE4_IDENTIFIER_GROUP;
-
-			if (params->mode==e_special && gid==ownerGID) {
-				ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
-				ace_v4->who.special_id = SMB_ACE4_WHO_GROUP;
-			} else {
-				ace_v4->who.gid = gid;
-			}
+			ace_v4->who.gid = gid;
 		} else if (sid_to_uid(&ace_nt->trustee, &uid)) {
-			if (params->mode==e_special && uid==ownerUID) {
-				ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
-				ace_v4->who.special_id = SMB_ACE4_WHO_OWNER;
-			} else {
-				ace_v4->who.uid = uid;
-			}
+			ace_v4->who.uid = uid;
 		} else {
 			DEBUG(1, ("nfs4_acls.c: file [%s]: could not "
 				  "convert %s to uid or gid\n",
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 391a314..16f609d 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -834,15 +834,19 @@ static NTSTATUS idmap_autorid_preallocate_wellknown(struct idmap_domain *dom)
 		return NT_STATUS_OK;
 	}
 
-	num = sizeof(groups)/sizeof(char*);
+	num = ARRAY_SIZE(groups);
 
-	maps = talloc_zero_array(talloc_tos(), struct id_map*, num+1);
+	maps = talloc_array(talloc_tos(), struct id_map*, num+1);
 	if (!maps) {
 		return NT_STATUS_NO_MEMORY;
 	}
 
 	for (i = 0; i < num; i++) {
 		maps[i] = talloc(maps, struct id_map);
+		if (maps[i] == NULL) {
+			talloc_free(maps);
+			return NT_STATUS_NO_MEMORY;
+		}
 		maps[i]->xid.type = ID_TYPE_GID;
 		maps[i]->sid = dom_sid_parse_talloc(maps, groups[i]);
 	}


-- 
Samba Shared Repository