Changeset 140 for branches/samba-3.0/source/smbd/posix_acls.c

Timestamp:

07/11/08 01:13:42 (5 months ago)

Author:

psmedley

Message:

Update branch to 3.0.31 release

Files:

• branches/samba-3.0/source/smbd/posix_acls.c (modified) (5 diffs)

branches/samba-3.0/source/smbd/posix_acls.c

@@ -2290 +2290 @@
 
 /****************************************************************************
- Should we override a deny ?  Check deprecated 'acl group control'
- and 'dos filemode'
-****************************************************************************/
-
-static BOOL acl_group_override(connection_struct *conn, gid_t prim_gid)
-{
-        if ( (errno == EACCES || errno == EPERM) 
-                && (lp_acl_group_control(SNUM(conn)) || lp_dos_filemode(SNUM(conn)))
-                && current_user_in_group(prim_gid)) 
-        {
+ Should we override a deny ?  Check 'acl group control' and 'dos filemode'
+****************************************************************************/
+
+static BOOL acl_group_override(connection_struct *conn, gid_t prim_gid, const char *fname)
+{
+        SMB_STRUCT_STAT sbuf;
+
+        if ((errno != EPERM) && (errno != EACCES)) {
+                return False;
+        }
+
+        /* file primary group == user primary or supplementary group */
+        if (lp_acl_group_control(SNUM(conn)) && current_user_in_group(prim_gid)) {
                 return True;
-        } 
+        }
+
+        /* user has writeable permission */
+        if (lp_dos_filemode(SNUM(conn)) && can_write_to_file(conn, fname, &sbuf)) {
+                return True;
+        }
 
         return False;
@@ -2489 +2497 @@
                         }
 
-                        if (acl_group_override(conn, prim_gid)) {
+                        if (acl_group_override(conn, prim_gid, fsp->fsp_name)) {
                                 int sret;
 
@@ -2520 +2528 @@
                         }
 
-                        if (acl_group_override(conn, prim_gid)) {
+                        if (acl_group_override(conn, prim_gid, fsp->fsp_name)) {
                                 int sret;
 
@@ -3478 +3486 @@
                                                 int sret = -1;
 
-                                                if (acl_group_override(conn, sbuf.st_gid)) {
+                                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
                                                         DEBUG(5,("set_nt_acl: acl group control on and "
                                                                 "current user in file %s primary group. Override delete_def_acl\n",
@@ -3525 +3533 @@
                                         if(SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms) == -1) {
                                                 int sret = -1;
-                                                if (acl_group_override(conn, sbuf.st_gid)) {
+                                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
                                                         DEBUG(5,("set_nt_acl: acl group control on and "
                                                                 "current user in file %s primary group. Override chmod\n",