summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Werth <alexander.werth@de.ibm.com>2013-07-09 17:14:08 +0200
committerChristian Ambach <ambi@samba.org>2013-07-16 00:52:26 +0200
commit9b2aa351ceb756d6ea63f3158f0e983ae7262da8 (patch)
tree7644d076fb753ea3a975b557e2401471384bba02
parent4a9e5d24749f7d8571f107c20ee66092ce7ab21d (diff)
downloadsamba-9b2aa351ceb756d6ea63f3158f0e983ae7262da8.tar.gz
samba-9b2aa351ceb756d6ea63f3158f0e983ae7262da8.tar.bz2
samba-9b2aa351ceb756d6ea63f3158f0e983ae7262da8.zip
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
-rw-r--r--source3/modules/nfs4_acls.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 255741c868..dab1a2abe4 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",