s3: Remove old mode special substitution.
authorAlexander Werth <alexander.werth@de.ibm.com>
Tue, 9 Jul 2013 15:14:08 +0000 (17:14 +0200)
committerChristian Ambach <ambi@samba.org>
Mon, 15 Jul 2013 22:52:26 +0000 (00:52 +0200)
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

source3/modules/nfs4_acls.c

index 255741c868690a3502e2257a2d7ba74422acd006..dab1a2abe4cd208035762f8ad9b2304ad3fb6d4e 100644 (file)
@@ -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",