svn commit: samba r12250 - in branches/SAMBA_3_0/source/smbd: .
jra at samba.org
jra at samba.org
Wed Dec 14 23:53:01 GMT 2005
Author: jra
Date: 2005-12-14 23:52:58 +0000 (Wed, 14 Dec 2005)
New Revision: 12250
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12250
Log:
Patch from Martin Koeppe <mkoeppe at 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.
Modified:
branches/SAMBA_3_0/source/smbd/trans2.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c 2005-12-14 23:52:56 UTC (rev 12249)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-12-14 23:52:58 UTC (rev 12250)
@@ -1436,8 +1436,8 @@
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 @@
}
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 @@
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;
More information about the samba-cvs
mailing list