svn commit: samba r19627 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_23/source/smbd SAMBA_3_0_24/source/smbd

[jra at samba.org]

Author: jra
Date: 2006-11-07 18:35:41 +0000 (Tue, 07 Nov 2006)
New Revision: 19627

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19627

Log:
Fix for bug #4211 - logic error in acl_group_override()
function. Fix from Jim Wang of Wesoft.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/posix_acls.c
   branches/SAMBA_3_0_23/source/smbd/posix_acls.c
   branches/SAMBA_3_0_24/source/smbd/posix_acls.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/posix_acls.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/posix_acls.c	2006-11-07 17:18:00 UTC (rev 19626)
+++ branches/SAMBA_3_0/source/smbd/posix_acls.c	2006-11-07 18:35:41 UTC (rev 19627)
@@ -2256,8 +2256,8 @@
 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;
 	} 

Modified: branches/SAMBA_3_0_23/source/smbd/posix_acls.c
===================================================================
--- branches/SAMBA_3_0_23/source/smbd/posix_acls.c	2006-11-07 17:18:00 UTC (rev 19626)
+++ branches/SAMBA_3_0_23/source/smbd/posix_acls.c	2006-11-07 18:35:41 UTC (rev 19627)
@@ -2257,8 +2257,8 @@
 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;
 	} 

Modified: branches/SAMBA_3_0_24/source/smbd/posix_acls.c
===================================================================
--- branches/SAMBA_3_0_24/source/smbd/posix_acls.c	2006-11-07 17:18:00 UTC (rev 19626)
+++ branches/SAMBA_3_0_24/source/smbd/posix_acls.c	2006-11-07 18:35:41 UTC (rev 19627)
@@ -2257,8 +2257,8 @@
 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;
 	}