diff options
| author | Jeremy Allison <jra@samba.org> | 2000-02-18 03:54:26 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-02-18 03:54:26 +0000 |
| commit | 8dcac9f8daab74e1a95293fbf64d0c95ce7a0d2a (patch) | |
| tree | 996ec9920c5dea2df8b495d2fe5dd4d8c773da64 | |
| parent | 1a27ef121a020cba88bf4a39959c7f299a7155ad (diff) | |
| download | samba-8dcac9f8daab74e1a95293fbf64d0c95ce7a0d2a.tar.gz samba-8dcac9f8daab74e1a95293fbf64d0c95ce7a0d2a.tar.bz2 samba-8dcac9f8daab74e1a95293fbf64d0c95ce7a0d2a.zip | |
Fix for reporting file system attributes correctly.
Jeremy.
(This used to be commit 801ed2389b97f921aa855513696d304c542fda04)
| -rw-r--r-- | source3/include/smb.h | 15 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 3 |
2 files changed, 13 insertions, 5 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 085325939f..18b2cb1542 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1247,10 +1247,17 @@ struct bitmap { #define RENAME_REPLACE_IF_EXISTS 1 /* Filesystem Attributes. */ -#define FILE_CASE_SENSITIVE_SEARCH 0x1 -#define FILE_CASE_PRESERVED_NAMES 0x2 -#define FILE_UNICODE_ON_DISK 0x4 -#define FILE_PERSISTENT_ACLS 0x8 +#define FILE_CASE_SENSITIVE_SEARCH 0x01 +#define FILE_CASE_PRESERVED_NAMES 0x02 +#define FILE_UNICODE_ON_DISK 0x04 +/* According to cifs9f, this is 4, not 8 */ +/* Acconding to testing, this actually sets the security attribute! */ +#define FILE_PERSISTENT_ACLS 0x08 +/* These entries added from cifs9f --tsb */ +#define FILE_FILE_COMPRESSION 0x08 +#define FILE_VOLUME_QUOTAS 0x10 +#define FILE_DEVICE_IS_MOUNTED 0x20 +#define FILE_VOLUME_IS_COMPRESSED 0x8000 /* ChangeNotify flags. */ #define FILE_NOTIFY_CHANGE_FILE_NAME 0x001 diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index bd2237253e..dff57a41c2 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1170,7 +1170,8 @@ static int call_trans2qfsinfo(connection_struct *conn, { int fstype_len; SIVAL(pdata,0,FILE_CASE_PRESERVED_NAMES|FILE_CASE_SENSITIVE_SEARCH| - lp_nt_acl_support() ? FILE_PERSISTENT_ACLS : 0); /* FS ATTRIBUTES */ + FILE_DEVICE_IS_MOUNTED| + (lp_nt_acl_support() ? FILE_PERSISTENT_ACLS : 0)); /* FS ATTRIBUTES */ #if 0 /* Old code. JRA. */ SIVAL(pdata,0,0x4006); /* FS ATTRIBUTES == long filenames supported? */ #endif /* Old code. */ |