svn commit: samba r3812 - in trunk/source/smbd: .

[vlendec at samba.org]

Author: vlendec
Date: 2004-11-17 15:57:04 +0000 (Wed, 17 Nov 2004)
New Revision: 3812

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

Log:
Believe it or not, but this patch seems to be necessary. If someone sets a
folder icon in the start menu and saves the profile on a samba server, after
logging in again this setting is gone. Why is this? The folder for which the
icon is set must have the read only flag set. If it is not set, the
desktop.ini file (the file containing the icon reference) inside that folder
is ignored.

lp_profile_acls is a hack for such a situation, so overload this parameter
with another profile-related hack.

Volker

Modified:
   trunk/source/smbd/trans2.c


Changeset:
Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2004-11-17 15:56:47 UTC (rev 3811)
+++ trunk/source/smbd/trans2.c	2004-11-17 15:57:04 UTC (rev 3812)
@@ -963,8 +963,13 @@
 				adate &= ~1;
 			}
 
-			if(mode & aDIR)
+			if(mode & aDIR) {
+				/* This is necessary, as otherwise the
+				 * desktop.ini file in this folder is
+				 * ignored */
+				mode |= (lp_profile_acls(SNUM(conn)) ? 1 : 0);
 				file_size = 0;
+			}
 
 			DEBUG(5,("get_lanman2_dir_entry found %s fname=%s\n",pathreal,fname));
 	  
@@ -2507,8 +2512,12 @@
 	fullpathname = fname;
 	file_size = get_file_size(sbuf);
 	allocation_size = get_allocation_size(fsp,&sbuf);
-	if (mode & aDIR)
+	if (mode & aDIR) {
+		/* This is necessary, as otherwise the desktop.ini file in
+		 * this folder is ignored */
+		mode |= (lp_profile_acls(SNUM(conn)) ? 1 : 0);
 		file_size = 0;
+	}
 
 	params = Realloc(*pparams,2);
 	if (params == NULL)