diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-09-18 03:00:20 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-09-18 03:00:20 +0000 |
| commit | c7da9992cb39fc84a6a915dd2158beaf5e616617 (patch) | |
| tree | 73f84eb8340e52b0362b3c7f84710062114194e4 /source3/smbd/trans2.c | |
| parent | fdc07d1417274d10038da83cee2ea718e6a7abec (diff) | |
| download | samba-c7da9992cb39fc84a6a915dd2158beaf5e616617.tar.gz samba-c7da9992cb39fc84a6a915dd2158beaf5e616617.tar.bz2 samba-c7da9992cb39fc84a6a915dd2158beaf5e616617.zip | |
gto ri of a bunch more #ifdef LARGE_SMB_OFF_T checks by introducing a
SOFF_T() macro for setting an SMB_OFF_T variable
also limited mmap based reads to MAX_MMAP_SIZE. We really can't mmap
2^50 bytes due to virtual address space problems.
(This used to be commit 4e784b18899eddd2399a51fa7d8c219560432922)
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 49687d4cca..fe2869db93 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -489,12 +489,8 @@ static int get_lanman2_dir_entry(connection_struct *conn, put_long_date(p,adate); p += 8; put_long_date(p,mdate); p += 8; put_long_date(p,mdate); p += 8; - SIVAL(p,0,size); - SIVAL(p,8,size); -#ifdef LARGE_SMB_OFF_T - SIVAL(p,4,size >> 32); - SIVAL(p,12,size >> 32); -#endif /* LARGE_SMB_OFF_T */ + SOFF_T(p,0,size); + SOFF_T(p,8,size); p += 16; SIVAL(p,0,nt_extmode); p += 4; SIVAL(p,0,strlen(fname)); p += 4; @@ -522,12 +518,8 @@ static int get_lanman2_dir_entry(connection_struct *conn, put_long_date(p,adate); p += 8; put_long_date(p,mdate); p += 8; put_long_date(p,mdate); p += 8; - SIVAL(p,0,size); - SIVAL(p,8,size); -#ifdef LARGE_SMB_OFF_T - SIVAL(p,4,size >> 32); - SIVAL(p,12,size >> 32); -#endif /* LARGE_SMB_OFF_T */ + SOFF_T(p,0,size); + SOFF_T(p,8,size); p += 16; SIVAL(p,0,nt_extmode); p += 4; SIVAL(p,0,strlen(fname)); p += 4; @@ -545,12 +537,8 @@ static int get_lanman2_dir_entry(connection_struct *conn, put_long_date(p,adate); p += 8; put_long_date(p,mdate); p += 8; put_long_date(p,mdate); p += 8; - SIVAL(p,0,size); - SIVAL(p,8,size); -#ifdef LARGE_SMB_OFF_T - SIVAL(p,4,size >> 32); - SIVAL(p,12,size >> 32); -#endif /* LARGE_SMB_OFF_T */ + SOFF_T(p,0,size); + SOFF_T(p,8,size); p += 16; SIVAL(p,0,nt_extmode); p += 4; SIVAL(p,0,strlen(fname)); p += 4; @@ -1349,12 +1337,8 @@ static int call_trans2qfilepathinfo(connection_struct *conn, case SMB_QUERY_FILE_STANDARD_INFO: data_size = 22; - SIVAL(pdata,0,size); - SIVAL(pdata,8,size); -#ifdef LARGE_SMB_OFF_T - SIVAL(pdata,4,size>>32); - SIVAL(pdata,12,size>>32); -#endif /* LARGE_SMB_OFF_T */ + SOFF_T(pdata,0,size); + SOFF_T(pdata,8,size); SIVAL(pdata,16,sbuf.st_nlink); CVAL(pdata,20) = 0; CVAL(pdata,21) = (mode&aDIR)?1:0; @@ -1392,10 +1376,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, case SMB_QUERY_FILE_ALLOCATION_INFO: case SMB_QUERY_FILE_END_OF_FILEINFO: data_size = 8; - SIVAL(pdata,0,size); -#ifdef LARGE_SMB_OFF_T - SIVAL(pdata,4,size >> 32); -#endif /* LARGE_SMB_OFF_T */ + SOFF_T(pdata,0,size); break; case SMB_QUERY_FILE_ALL_INFO: @@ -1405,12 +1386,8 @@ static int call_trans2qfilepathinfo(connection_struct *conn, put_long_date(pdata+24,sbuf.st_mtime); /* change time */ SIVAL(pdata,32,mode); pdata += 40; - SIVAL(pdata,0,size); - SIVAL(pdata,8,size); -#ifdef LARGE_SMB_OFF_T - SIVAL(pdata,4,size >> 32); - SIVAL(pdata,12,size >> 32); -#endif /* LARGE_SMB_OFF_T */ + SOFF_T(pdata,0,size); + SOFF_T(pdata,8,size); SIVAL(pdata,16,sbuf.st_nlink); CVAL(pdata,20) = 0; CVAL(pdata,21) = (mode&aDIR)?1:0; |