Attachment 6724 Details for Bug 8330 – Patch simplifying the check

[patch] Patch simplifying the check

0001-s3-modules-nfs4_acls-improve-fix-for-bug-8330.patch (text/plain), 1020 bytes, created by Michael Adam on 2011-07-28 07:57:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2011-07-28 07:57:02 UTC

Size: 1020 bytes

patch

obsolete

>From 0bcdb0ad89cfa34275ab1e6e1b2be4a8c36a8a74 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 28 Jul 2011 09:49:34 +0200
>Subject: [PATCH] s3:modules:nfs4_acls: improve fix for bug #8330
>
>simplify the check insmbacl4_find_equal_special()
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>---
> source3/modules/nfs4_acls.c |    6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
>diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
>index f1c2904..2e5ffbc 100644
>--- a/source3/modules/nfs4_acls.c
>+++ b/source3/modules/nfs4_acls.c
>@@ -519,10 +519,8 @@ static SMB_ACE4PROP_T *smbacl4_find_equal_special(
> 
> 		if (ace->flags == aceNew->flags &&
> 			ace->aceType==aceNew->aceType &&
>-			ace->aceFlags==aceNew->aceFlags &&
>-			(ace->aceFlags&SMB_ACE4_IDENTIFIER_GROUP)==
>-			(aceNew->aceFlags&SMB_ACE4_IDENTIFIER_GROUP)
>-		) {
>+			ace->aceFlags==aceNew->aceFlags)
>+		{
> 			/* keep type safety; e.g. gid is an u.short */
> 			if (ace->flags & SMB_ACE4_ID_SPECIAL)
> 			{
>-- 
>1.7.1
>

Flags:

ambi: review+

Actions: View

Attachments on bug 8330: 6723 | 6724