Changeset 274 for branches/samba-3.3.x/source/smbd/posix_acls.c

Timestamp:

Jun 17, 2009, 2:19:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

File:

• branches/samba-3.3.x/source/smbd/posix_acls.c (modified) (2 diffs)

branches/samba-3.3.x/source/smbd/posix_acls.c

@@ -1118 +1118 @@
                 return True;
 
-        /* Assume that the current user is in the current group (force group) */
-
-        if (uid_ace->unix_ug.uid == current_user.ut.uid && group_ace->unix_ug.gid == current_user.ut.gid)
-                return True;
+        /*
+         * if it's the current user, we already have the unix token
+         * and don't need to do the complex user_in_group_sid() call
+         */
+        if (uid_ace->unix_ug.uid == current_user.ut.uid) {
+                size_t i;
+
+                if (group_ace->unix_ug.gid == current_user.ut.gid) {
+                        return True;
+                }
+
+                for (i=0; i < current_user.ut.ngroups; i++) {
+                        if (group_ace->unix_ug.gid == current_user.ut.groups[i]) {
+                                return True;
+                        }
+                }
+        }
 
         /* u_name talloc'ed off tos. */
@@ -1128 +1141 @@
                 return False;
         }
+
+        /* notice that this is not reliable for users exported by winbindd! */
         return user_in_group_sid(u_name, &group_ace->trustee);
 }