diff options
| author | Jeremy Allison <jra@samba.org> | 2005-05-01 09:30:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:44 -0500 |
| commit | 431a28a3151f6cb8f9e1de769da11a22c379d9d8 (patch) | |
| tree | d07c2ce21e0f43eda9cef2d13f0c296b40dc07d9 /source3/smbd/dir.c | |
| parent | fc396cb2202dadc9acf741957d2dc3420bd0a7ac (diff) | |
| download | samba-431a28a3151f6cb8f9e1de769da11a22c379d9d8.tar.gz samba-431a28a3151f6cb8f9e1de769da11a22c379d9d8.tar.xz samba-431a28a3151f6cb8f9e1de769da11a22c379d9d8.zip | |
r6548: Fix bug #2622 - remove DPTR_MASK as it makes no sense.
Jeremy.
(This used to be commit 927681c8c4458c77de2622557f1465fd5ca1c28b)
Diffstat (limited to 'source3/smbd/dir.c')
| -rw-r--r-- | source3/smbd/dir.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 5ebbfe478fc..3c93c188ff3 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -624,11 +624,11 @@ BOOL dptr_fill(char *buf1,unsigned int key) DEBUG(1,("filling null dirptr %d\n",key)); return(False); } - offset = TellDir(dptr->dir_hnd); + 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)); buf[0] = key; - SIVAL(buf,1,offset | DPTR_MASK); + SIVAL(buf,1,offset); return(True); } @@ -641,16 +641,22 @@ struct dptr_struct *dptr_fetch(char *buf,int *num) unsigned int key = *(unsigned char *)buf; struct dptr_struct *dptr = dptr_get(key, False); uint32 offset; + long seekoff; if (!dptr) { DEBUG(3,("fetched null dirptr %d\n",key)); return(NULL); } *num = key; - offset = IVAL(buf,1)&~DPTR_MASK; - SeekDir(dptr->dir_hnd,(long)offset); + offset = IVAL(buf,1); + if (offset == (uint32)-1) { + seekoff = -1; + } else { + seekoff = (long)offset; + } + SeekDir(dptr->dir_hnd,seekoff); DEBUG(3,("fetching dirptr %d for path %s at offset %d\n", - key,dptr_path(key),offset)); + key,dptr_path(key),(int)seekoff)); return(dptr); } |