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 | eb78ce1f550377bfb1fd43f550641cf8a606e973 (patch) | |
| tree | cdb9db3bb34ee5c8c6a6c2acf84049080f848dab /source/smbd/posix_acls.c | |
| parent | 9a51fba71c5fa7082c331e1a78a98638d9aa06cf (diff) | |
| download | samba-eb78ce1f550377bfb1fd43f550641cf8a606e973.tar.gz samba-eb78ce1f550377bfb1fd43f550641cf8a606e973.tar.xz samba-eb78ce1f550377bfb1fd43f550641cf8a606e973.zip | |
r19627: Fix for bug #4211 - logic error in acl_group_override()
function. Fix from Jim Wang of Wesoft.
Jeremy.
Diffstat (limited to 'source/smbd/posix_acls.c')
| -rw-r--r-- | source/smbd/posix_acls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c index 3b38b91547c..f17594c0796 100644 --- a/source/smbd/posix_acls.c +++ b/source/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; } |