The branch, master has been updated
via e7707d5 From metze's work on sparse attributes.
FILE_ATTRIBUTE_SPARSE is valid on get but not on set.
from 139e2cb s3-printing: fix printer_list_traverse()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e7707d5abd7365c89405963c7cac0c0382d9179e
Author: Jeremy Allison <j...@samba.org>
Date: Mon Dec 20 10:23:27 2010 -0800
From metze's work on sparse attributes. FILE_ATTRIBUTE_SPARSE is valid on
get but not on set.
Autobuild-User: Jeremy Allison <j...@samba.org>
Autobuild-Date: Mon Dec 20 20:11:22 CET 2010 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/include/smb.h | 3 +--
source3/smbd/dosmode.c | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index b87caf2..2b397cc 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1211,8 +1211,7 @@ struct bitmap {
FILE_ATTRIBUTE_HIDDEN|\
FILE_ATTRIBUTE_SYSTEM|\
FILE_ATTRIBUTE_DIRECTORY|\
- FILE_ATTRIBUTE_ARCHIVE|\
- FILE_ATTRIBUTE_SPARSE)
+ FILE_ATTRIBUTE_ARCHIVE)
/* Flags - combined with attributes. */
#define FILE_FLAG_WRITE_THROUGH 0x80000000L
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 628f887..2c6dcd0 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -318,7 +318,8 @@ static bool get_ea_dos_attribute(connection_struct *conn,
if (S_ISDIR(smb_fname->st.st_ex_mode)) {
dosattr |= aDIR;
}
- *pattr = (uint32)(dosattr & SAMBA_ATTRIBUTES_MASK);
+ /* FILE_ATTRIBUTE_SPARSE is valid on get but not on set. */
+ *pattr = (uint32)(dosattr &
(SAMBA_ATTRIBUTES_MASK|FILE_ATTRIBUTE_SPARSE));
DEBUG(8,("get_ea_dos_attribute returning (0x%x)", dosattr));
--
Samba Shared Repository
