summaryrefslogtreecommitdiffstats
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-12-10 23:27:12 +0000
committerJeremy Allison <jra@samba.org>2002-12-10 23:27:12 +0000
commit89ef861b4b7530a8a9a157b2e9e253a2e5716738 (patch)
tree26b241e3dc81e19f622abb7139caf1eab0d9ffb4 /source3/include
parent3f501f0e31e0d1d6d171ac7c1d999d395a97485a (diff)
downloadsamba-89ef861b4b7530a8a9a157b2e9e253a2e5716738.tar.gz
samba-89ef861b4b7530a8a9a157b2e9e253a2e5716738.tar.xz
samba-89ef861b4b7530a8a9a157b2e9e253a2e5716738.zip
Fix client large file reporting.
Jeremy (This used to be commit 185804ac945e717a5e3d3602e8118b35080f6251)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/client.h2
-rw-r--r--source3/include/includes.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/source3/include/client.h b/source3/include/client.h
index 17fd150065..853ee7ae42 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -35,7 +35,7 @@
typedef struct file_info
{
- SMB_OFF_T size;
+ SMB_BIG_UINT size;
uint16 mode;
uid_t uid;
gid_t gid;
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9ea6e91bdf..8ec38b9255 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -590,10 +590,14 @@ typedef int socklen_t;
#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32))
#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32))
#define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF) )))
+#define IVAL2_TO_SMB_BIG_UINT(buf,off) ( (((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF)) | \
+ (( ((SMB_BIG_UINT)(IVAL((buf),(off+4)))) & ((SMB_BIG_UINT)0xFFFFFFFF) ) << 32 ) )
#else
#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0))
#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,v),SIVAL(p,ofs,0))
#define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((uint32)(IVAL((buf),(off)))) & 0xFFFFFFFF )))
+#define IVAL2_TO_SMB_BIG_UINT(buf,off) ( (((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF)) | \
+ (( ((SMB_BIG_UINT)(IVAL((buf),(off+4)))) & ((SMB_BIG_UINT)0xFFFFFFFF) ) << 32 ) )
#endif
/*