svn commit: samba r4262 - in branches/SAMBA_4_0/source: lib ntvfs/posix

[tridge at samba.org]

Author: tridge
Date: 2004-12-18 01:16:04 +0000 (Sat, 18 Dec 2004)
New Revision: 4262

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

Log:
a sniff from kukks showed that the FILE_ATTRIBUTE_NORMAL handling in
pvfs was not correct. This should fix a xcopy bug on OS/2.


Modified:
   branches/SAMBA_4_0/source/lib/util_str.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fileinfo.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_util.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/util_str.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util_str.c	2004-12-17 22:47:49 UTC (rev 4261)
+++ branches/SAMBA_4_0/source/lib/util_str.c	2004-12-18 01:16:04 UTC (rev 4262)
@@ -1120,6 +1120,7 @@
 		{'A', FILE_ATTRIBUTE_ARCHIVE},
 		{'H', FILE_ATTRIBUTE_HIDDEN},
 		{'S', FILE_ATTRIBUTE_SYSTEM},
+		{'N', FILE_ATTRIBUTE_NORMAL},
 		{'R', FILE_ATTRIBUTE_READONLY},
 		{'d', FILE_ATTRIBUTE_DEVICE},
 		{'t', FILE_ATTRIBUTE_TEMPORARY},

Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fileinfo.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fileinfo.c	2004-12-17 22:47:49 UTC (rev 4261)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_fileinfo.c	2004-12-18 01:16:04 UTC (rev 4262)
@@ -57,15 +57,6 @@
 	if (S_ISDIR(st->st_mode))
 		result = FILE_ATTRIBUTE_DIRECTORY | (result & FILE_ATTRIBUTE_READONLY);
 
-	if (!(result & 
-	      (FILE_ATTRIBUTE_READONLY|
-	       FILE_ATTRIBUTE_ARCHIVE|
-	       FILE_ATTRIBUTE_SYSTEM|
-	       FILE_ATTRIBUTE_HIDDEN|
-	       FILE_ATTRIBUTE_DIRECTORY))) {
-		result |= FILE_ATTRIBUTE_NORMAL;
-	}
- 
 	return result;
 }
 

Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_util.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_util.c	2004-12-17 22:47:49 UTC (rev 4261)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_util.c	2004-12-18 01:16:04 UTC (rev 4262)
@@ -70,9 +70,6 @@
 */
 uint32_t pvfs_attrib_normalise(uint32_t attrib)
 {
-	if (attrib == 0) {
-		attrib = FILE_ATTRIBUTE_NORMAL;
-	}
 	if (attrib != FILE_ATTRIBUTE_NORMAL) {
 		attrib &= ~FILE_ATTRIBUTE_NORMAL;
 	}