Attachment 9088 Details for Bug 10045 – 4.1 patch cherry-picked from master

[patch] 4.1 patch cherry-picked from master

0001-s3-Remove-old-mode-special-substitution.patch (text/plain), 1.62 KB, created by Andrew Bartlett on 2013-07-29 23:57:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2013-07-29 23:57:01 UTC

Size: 1.62 KB

patch

obsolete

>From f296e249d083c8742c60977aa778db97ded411fd Mon Sep 17 00:00:00 2001
>From: Alexander Werth <alexander.werth@de.ibm.com>
>Date: Tue, 9 Jul 2013 17:14:08 +0200
>Subject: [PATCH] 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@samba.org>
>Reviewed-by: Christian Ambach <ambi@samba.org>
>
>Autobuild-User(master): Christian Ambach <ambi@samba.org>
>Autobuild-Date(master): Tue Jul 16 00:52:26 CEST 2013 on sn-devel-104
>(cherry picked from commit 9b2aa351ceb756d6ea63f3158f0e983ae7262da8)
>---
> source3/modules/nfs4_acls.c |   15 ++-------------
> 1 file changed, 2 insertions(+), 13 deletions(-)
>
>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",
>-- 
>1.7.10.4
>

Flags:

ambi: review+

Actions: View

Attachments on bug 10045: 9088