r19627: Fix for bug #4211 - logic error in acl_group_override()

function. Fix from Jim Wang of Wesoft.
Jeremy.
(This used to be commit eb78ce1f550377bfb1fd43f550641cf8a606e973)

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 3b38b91547c0ec42970e9e3c8f7c66c161530468..f17594c0796de2cf3213798ce3db160f16e9de74 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2256,8 +2256,8 @@ static BOOL current_user_in_group(gid_t gid)
 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) ) 
+               && (lp_acl_group_control(SNUM(conn)) || lp_dos_filemode(SNUM(conn)))
+               && current_user_in_group(prim_gid)) 
        {
                return True;
        }