diff options
| author | Jeremy Allison <jra@samba.org> | 2006-11-07 18:35:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:43 -0500 |
| commit | 892d07b30bc0d3859fce7e8e5baa33a82827cb48 (patch) | |
| tree | 5b64aaa4f199625b080a2ee65de591354d7401ab /source3/smbd/posix_acls.c | |
| parent | 9a0273634860386ecdd6b4c606f30f2620ae3dc0 (diff) | |
| download | samba-892d07b30bc0d3859fce7e8e5baa33a82827cb48.tar.gz samba-892d07b30bc0d3859fce7e8e5baa33a82827cb48.tar.bz2 samba-892d07b30bc0d3859fce7e8e5baa33a82827cb48.zip | |
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)
Diffstat (limited to 'source3/smbd/posix_acls.c')
| -rw-r--r-- | source3/smbd/posix_acls.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |