From b02c5abfb470575a67ced192b2913b5a1c73dd3e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 18 Dec 2004 01:16:04 +0000
Subject: r4262: 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. (This
 used to be commit 7251f1fcdd8980e9c49a58e665374025e07bb8d0)

---
 source4/ntvfs/posix/pvfs_fileinfo.c | 9 ---------
 source4/ntvfs/posix/pvfs_util.c     | 3 ---
 2 files changed, 12 deletions(-)

(limited to 'source4/ntvfs')

diff --git a/source4/ntvfs/posix/pvfs_fileinfo.c b/source4/ntvfs/posix/pvfs_fileinfo.c
index aafecf0950..888d5f78c0 100644
--- a/source4/ntvfs/posix/pvfs_fileinfo.c
+++ b/source4/ntvfs/posix/pvfs_fileinfo.c
@@ -57,15 +57,6 @@ static uint32_t dos_mode_from_stat(struct pvfs_state *pvfs, struct stat *st)
 	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;
 }
 
diff --git a/source4/ntvfs/posix/pvfs_util.c b/source4/ntvfs/posix/pvfs_util.c
index 67dd9d22b3..6026b9fbf3 100644
--- a/source4/ntvfs/posix/pvfs_util.c
+++ b/source4/ntvfs/posix/pvfs_util.c
@@ -70,9 +70,6 @@ NTSTATUS pvfs_match_attrib(struct pvfs_state *pvfs, struct pvfs_filename *name,
 */
 uint32_t pvfs_attrib_normalise(uint32_t attrib)
 {
-	if (attrib == 0) {
-		attrib = FILE_ATTRIBUTE_NORMAL;
-	}
 	if (attrib != FILE_ATTRIBUTE_NORMAL) {
 		attrib &= ~FILE_ATTRIBUTE_NORMAL;
 	}
-- 
cgit