diff options
| author | Jeremy Allison <jra@samba.org> | 2005-12-14 23:52:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:51 -0500 |
| commit | 91efc453ab420d51998e159d14264cc24be71558 (patch) | |
| tree | f5c148bd412df93a9cb4ad540e8305e0ae5d83a3 /source3 | |
| parent | 3a405096c50fa9e625f3626e42806950a6602ca8 (diff) | |
| download | samba-91efc453ab420d51998e159d14264cc24be71558.tar.gz samba-91efc453ab420d51998e159d14264cc24be71558.tar.bz2 samba-91efc453ab420d51998e159d14264cc24be71558.zip | |
r12250: Patch from Martin Koeppe <mkoeppe@gmx.de> for #3287
to make the dev/inode numbers match what SFU expects.
If we're using 8 byte inodes we'll lose the top 4 bytes
and replace them with a dev_t instead, but this seem
reasonable to ensure uniqueness.
Jeremy.
(This used to be commit e53574d0b43e5525029c89e56331701399013d91)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/trans2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index c165ea1862..6a4b7111cd 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1436,8 +1436,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn, p +=4; } SIVAL(p,0,0); p += 4; /* Unknown - reserved ? */ - SIVAL(p,0,sbuf.st_dev); p += 4; - SIVAL(p,0,sbuf.st_ino); p += 4; + SIVAL(p,0,sbuf.st_ino); p += 4; /* FileIndexLow */ + SIVAL(p,0,sbuf.st_dev); p += 4; /* FileIndexHigh */ len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE_ASCII); SIVAL(q, 0, len); p += len; @@ -1486,8 +1486,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn, } p += 26; SSVAL(p,0,0); p += 2; /* Reserved ? */ - SIVAL(p,0,sbuf.st_dev); p += 4; - SIVAL(p,0,sbuf.st_ino); p += 4; + SIVAL(p,0,sbuf.st_ino); p += 4; /* FileIndexLow */ + SIVAL(p,0,sbuf.st_dev); p += 4; /* FileIndexHigh */ len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE_ASCII); SIVAL(q,0,len); p += len; @@ -3216,8 +3216,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd BasicFileInformationTest. -tpot */ DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_INTERNAL_INFORMATION\n")); - SIVAL(pdata,0,sbuf.st_dev); - SIVAL(pdata,4,sbuf.st_ino); + SIVAL(pdata,4,sbuf.st_ino); /* FileIndexLow */ + SIVAL(pdata,0,sbuf.st_dev); /* FileIndexHigh */ data_size = 8; break; |