diff options
| author | Jeremy Allison <jra@samba.org> | 2001-11-08 00:23:37 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-11-08 00:23:37 +0000 |
| commit | fc15ce91e05ac39109ed566baca4a2b0469f08be (patch) | |
| tree | eb0876bdbaffef11d4487493286d0f0c2647b6fb | |
| parent | 1f6e662a7f16f25db844a09f97dbc5e280831902 (diff) | |
| download | samba-fc15ce91e05ac39109ed566baca4a2b0469f08be.tar.gz samba-fc15ce91e05ac39109ed566baca4a2b0469f08be.tar.xz samba-fc15ce91e05ac39109ed566baca4a2b0469f08be.zip | |
Added more #defines, added debug in vfs, fixed erroneous fs attribute.
Jeremy.
| -rw-r--r-- | source/include/smb.h | 9 | ||||
| -rw-r--r-- | source/smbd/trans2.c | 3 | ||||
| -rw-r--r-- | source/smbd/vfs.c | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/source/include/smb.h b/source/include/smb.h index 696d0840ee5..a6e3d4046d5 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -1048,7 +1048,9 @@ struct bitmap { #define FILE_ATTRIBUTE_ARCHIVE aARCH #define FILE_ATTRIBUTE_NORMAL 0x80L #define FILE_ATTRIBUTE_TEMPORARY 0x100L +#define FILE_ATTRIBUTE_SPARSE 0x200L #define FILE_ATTRIBUTE_COMPRESSED 0x800L +#define FILE_ATTRIBUTE_NONINDEXED 0x2000L #define SAMBA_ATTRIBUTES_MASK 0x7F /* Flags - combined with attributes. */ @@ -1102,9 +1104,10 @@ struct bitmap { /* 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_FILE_COMPRESSION 0x10 +#define FILE_VOLUME_QUOTAS 0x20 +/* I think this is wrong. JRA #define FILE_DEVICE_IS_MOUNTED 0x20 */ +#define FILE_VOLUME_SPARSE_FILE 0x40 #define FILE_VOLUME_IS_COMPRESSED 0x8000 /* ChangeNotify flags. */ diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index 6fdebff82ac..17529b1f216 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -1177,7 +1177,6 @@ static int call_trans2qfsinfo(connection_struct *conn, { int fstype_len; SIVAL(pdata,0,FILE_CASE_PRESERVED_NAMES|FILE_CASE_SENSITIVE_SEARCH| - FILE_DEVICE_IS_MOUNTED| (lp_nt_acl_support(SNUM(conn)) ? FILE_PERSISTENT_ACLS : 0)); /* FS ATTRIBUTES */ #if 0 /* Old code. JRA. */ SIVAL(pdata,0,0x4006); /* FS ATTRIBUTES == long filenames supported? */ @@ -1494,6 +1493,8 @@ static int call_trans2qfilepathinfo(connection_struct *conn, SIVAL(pdata,16,sbuf.st_nlink); CVAL(pdata,20) = 0; CVAL(pdata,21) = (mode&aDIR)?1:0; + + DEBUG(5,("FILE_STANDARD_INFO: size = %.0f\n", (double)size )); break; case SMB_FILE_EA_INFORMATION: diff --git a/source/smbd/vfs.c b/source/smbd/vfs.c index e165c42ee4f..73de4f0ec41 100644 --- a/source/smbd/vfs.c +++ b/source/smbd/vfs.c @@ -503,6 +503,7 @@ int vfs_set_filelen(files_struct *fsp, SMB_OFF_T len) int ret; release_level_2_oplocks_on_change(fsp); + DEBUG(10,("vfs_set_filelen: ftruncate %s to len %.0f\n", fsp->fsp_name, (double)len)); if ((ret = fsp->conn->vfs_ops.ftruncate(fsp, fsp->fd, len)) != -1) set_filelen_write_cache(fsp, len); |