svn commit: samba r8656 - in trunk/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2005-07-20 18:21:46 +0000 (Wed, 20 Jul 2005)
New Revision: 8656

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8656

Log:
Still trying to fix #2889. We don't need the DPTR_MASK after
all, now thinking it might be to do with flags2...
Jeremy.

Modified:
   trunk/source/smbd/dir.c


Changeset:
Modified: trunk/source/smbd/dir.c
===================================================================
--- trunk/source/smbd/dir.c	2005-07-20 18:21:38 UTC (rev 8655)
+++ trunk/source/smbd/dir.c	2005-07-20 18:21:46 UTC (rev 8656)
@@ -641,8 +641,6 @@
  Fill the 5 byte server reserved dptr field.
 ****************************************************************************/
 
-#define DPTR_MASK ((uint32)(((uint32)1)<<31))
-
 BOOL dptr_fill(char *buf1,unsigned int key)
 {
 	unsigned char *buf = (unsigned char *)buf1;
@@ -655,13 +653,8 @@
 	offset = (uint32)TellDir(dptr->dir_hnd);
 	DEBUG(6,("fill on key %u dirptr 0x%lx now at %d\n",key,
 		(long)dptr->dir_hnd,(int)offset));
-	if (offset != (uint32)-1 && (offset & DPTR_MASK)) {
-		DEBUG(0,("dptr_fill: Error - offset 0x%x has bit 32 set. Can't use in server state.\n",
-			(unsigned int)offset ));
-		return False;
-	}
 	buf[0] = key;
-	SIVAL(buf,1,offset | DPTR_MASK);
+	SIVAL(buf,1,offset);
 	return(True);
 }
 
@@ -685,7 +678,7 @@
 	if (offset == (uint32)-1) {
 		seekoff = -1;
 	} else {
-		seekoff = (long)(offset & ~DPTR_MASK);
+		seekoff = (long)offset;
 	}
 	SeekDir(dptr->dir_hnd,seekoff);
 	DEBUG(3,("fetching dirptr %d for path %s at offset %d\n",