svn commit: samba r13675 - branches/SAMBA_3_0/source/smbd trunk/source/smbd

jerry at samba.org jerry at samba.org
Fri Feb 24 16:00:56 GMT 2006


Author: jerry
Date: 2006-02-24 16:00:53 +0000 (Fri, 24 Feb 2006)
New Revision: 13675

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

Log:
* patch from Bjoern JACKE <samba at j3e.de> to remove the 
  artificial RO bit on directories in user profiles when
  profile acls = yes.



Modified:
   branches/SAMBA_3_0/source/smbd/trans2.c
   trunk/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c	2006-02-24 15:57:42 UTC (rev 13674)
+++ branches/SAMBA_3_0/source/smbd/trans2.c	2006-02-24 16:00:53 UTC (rev 13675)
@@ -1146,7 +1146,8 @@
 				continue;
 			}
 
-			file_size = get_file_size(sbuf);
+			if (!(mode & aDIR))
+				file_size = get_file_size(sbuf);
 			allocation_size = get_allocation_size(conn,NULL,&sbuf);
 			mdate = sbuf.st_mtime;
 			adate = sbuf.st_atime;
@@ -1158,13 +1159,6 @@
 				adate &= ~1;
 			}
 
-			if(mode & aDIR) {
-				/* This is necessary, as otherwise the
-				 * desktop.ini file in this folder is
-				 * ignored */
-				mode |= (lp_profile_acls(SNUM(conn)) ? aRONLY : 0);
-				file_size = 0;
-			}
 
 			DEBUG(5,("get_lanman2_dir_entry found %s fname=%s\n",pathreal,fname));
 	  
@@ -2915,13 +2909,8 @@
 		mode = FILE_ATTRIBUTE_NORMAL;
 
 	fullpathname = fname;
-	file_size = get_file_size(sbuf);
-	if (mode & aDIR) {
-		/* This is necessary, as otherwise the desktop.ini file in
-		 * this folder is ignored */
-		mode |= (lp_profile_acls(SNUM(conn)) ? aRONLY : 0);
-		file_size = 0;
-	}
+	if (!(mode & aDIR))
+		file_size = get_file_size(sbuf);
 
 	/* Pull any EA list from the data portion. */
 	if (info_level == SMB_INFO_QUERY_EAS_FROM_LIST) {

Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2006-02-24 15:57:42 UTC (rev 13674)
+++ trunk/source/smbd/trans2.c	2006-02-24 16:00:53 UTC (rev 13675)
@@ -1146,7 +1146,8 @@
 				continue;
 			}
 
-			file_size = get_file_size(sbuf);
+			if (!(mode & aDIR))
+				file_size = get_file_size(sbuf);
 			allocation_size = get_allocation_size(conn,NULL,&sbuf);
 			mdate = sbuf.st_mtime;
 			adate = sbuf.st_atime;
@@ -1158,13 +1159,6 @@
 				adate &= ~1;
 			}
 
-			if(mode & aDIR) {
-				/* This is necessary, as otherwise the
-				 * desktop.ini file in this folder is
-				 * ignored */
-				mode |= (lp_profile_acls(SNUM(conn)) ? aRONLY : 0);
-				file_size = 0;
-			}
 
 			DEBUG(5,("get_lanman2_dir_entry found %s fname=%s\n",pathreal,fname));
 	  
@@ -2915,13 +2909,8 @@
 		mode = FILE_ATTRIBUTE_NORMAL;
 
 	fullpathname = fname;
-	file_size = get_file_size(sbuf);
-	if (mode & aDIR) {
-		/* This is necessary, as otherwise the desktop.ini file in
-		 * this folder is ignored */
-		mode |= (lp_profile_acls(SNUM(conn)) ? aRONLY : 0);
-		file_size = 0;
-	}
+	if (!(mode & aDIR))
+		file_size = get_file_size(sbuf);
 
 	/* Pull any EA list from the data portion. */
 	if (info_level == SMB_INFO_QUERY_EAS_FROM_LIST) {



More information about the samba-cvs mailing list