[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  9bd9575... Re-fix bug 5202 - cannot change ACLs on writable file with "dos filemode=yes"
      from  5fd3261... Prevent NULL dereference if group has no members

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 9bd957580360ed7a0f98b02d1e03d7fcaf8a878e
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jan 8 10:24:34 2010 -0800

    Re-fix bug 5202 - cannot change ACLs on writable file with "dos filemode=yes"
    
    This bug re-occurred for 3.3.x and above.
    
    The reason is that to change a NT ACL we now have to open the file requesting
    WRITE_DAC and WRITE_OWNER access. The mapping from POSIX "w" to NT permissions
    in posix_acls doesn't add these bits when "dos filemode = yes", so even though
    the permission or owner change would be allowed by the POSIX ACL code, the
    NTCreateX call fails with ACCESS_DENIED now we always check NT permissions
    first.
    
    Added in the mapping from "w" to WRITE_DAC and WRITE_OWNER access.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/posix_acls.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index c8d9e00..2836389 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -930,6 +930,9 @@ static uint32_t map_canon_ace_perms(int snum,
 			nt_mask |= ((perms & S_IWUSR) ? UNIX_ACCESS_W : 0 );
 			nt_mask |= ((perms & S_IXUSR) ? UNIX_ACCESS_X : 0 );
 		}
+		if ((perms & S_IWUSR) && lp_dos_filemode(snum)) {
+			nt_mask |= (WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS);
+		}
 	}
 
 	DEBUG(10,("map_canon_ace_perms: Mapped (UNIX) %x to (NT) %x\n",


-- 
Samba Shared Repository