[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  e24fcf0 Fix bug 10162 - POSIX ACL mapping failing when setting DENY ACE's from Windows.
      from  807628e s3-rpc: remove unused source3/librpc/rpc/rpc_common.c

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e24fcf0f3e1b5b19d97a13786b09f069393b06d8
Author: Daniel Liberman <danielvl at gmail.com>
Date:   Thu Sep 19 20:28:33 2013 -0300

    Fix bug 10162 - POSIX ACL mapping failing when setting DENY ACE's from Windows.
    
    Fix for ACL problem - not accepting DENY. Code was checking for pointer and not for content.
    
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Sat Sep 21 05:24:07 CEST 2013 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 3b9be9d..ad1431d 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1808,7 +1808,7 @@ static bool add_current_ace_to_acl(files_struct *fsp, struct security_ace *psa,
 		if (current_ace->attr == ALLOW_ACE)
 			*got_file_allow = True;
 
-		if ((current_ace->attr == DENY_ACE) && got_file_allow) {
+		if ((current_ace->attr == DENY_ACE) && *got_file_allow) {
 			DEBUG(0,("add_current_ace_to_acl: malformed "
 				 "ACL in file ACL ! Deny entry after "
 				 "Allow entry. Failing to set on file "


-- 
Samba Shared Repository