From 892d07b30bc0d3859fce7e8e5baa33a82827cb48 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 7 Nov 2006 18:35:41 +0000 Subject: 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) --- source3/smbd/posix_acls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 3b38b91547..f17594c079 100644 --- 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; } -- cgit